Changeset 3f5e0961 in rtems


Ignore:
Timestamp:
Mar 1, 2016, 6:46:18 PM (4 years ago)
Author:
Joel Sherrill <joel@…>
Branches:
5, master
Children:
e56266c
Parents:
cc1add7b
git-author:
Joel Sherrill <joel@…> (03/01/16 18:46:18)
git-committer:
Joel Sherrill <joel@…> (03/03/16 14:12:53)
Message:

smdk2410: Resurrect missing gp32 files

When the gp32 BSP was obsoleted and removed, files were deleted that
were actually used by the gp32.

This was actually a violation of the expected directory structure
and why it wasn't caught. Another example of why continuous integration
testing -- even just building is important.

Location:
c/src/lib/libbsp/arm/smdk2410
Files:
6 added
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/smdk2410/Makefile.am

    rcc1add7b r3f5e0961  
    77dist_project_lib_DATA = bsp_specs
    88
    9 include_HEADERS = ../gp32/include/bsp.h
    10 include_HEADERS += ../gp32/smc/smc.h
     9include_HEADERS = include/bsp.h
     10include_HEADERS += smc/smc.h
    1111include_HEADERS += ../../shared/include/tm27.h
    1212
     
    1919
    2020noinst_LIBRARIES = libbspstart.a
    21 libbspstart_a_SOURCES = ../gp32/start/start.S
     21libbspstart_a_SOURCES = start/start.S
    2222project_lib_DATA = start.$(OBJEXT)
    2323
     
    2828
    2929# startup
    30 libbsp_a_SOURCES += \
    31     ../gp32/startup/bspstart.c ../gp32/startup/bspidle.c ../../shared/bspclean.c \
    32     startup/bspreset.c startup/memmap.c \
    33     ../../shared/bootcard.c ../../shared/sbrk.c \
    34     ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
    35     ../../shared/gnatinstallhandler.c
     30libbsp_a_SOURCES += startup/bspstart.c
     31libbsp_a_SOURCES += startup/bspidle.c
     32libbsp_a_SOURCES += ../../shared/bspclean.c
     33libbsp_a_SOURCES += startup/bspreset.c
     34libbsp_a_SOURCES += startup/memmap.c
     35libbsp_a_SOURCES += ../../shared/bootcard.c
     36libbsp_a_SOURCES += ../../shared/sbrk.c
     37
     38libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
     39libbsp_a_SOURCES += ../../shared/bspgetworkarea.c
     40libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
    3641libbsp_a_SOURCES += ../../shared/cpucounterread.c
    3742libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
    3843# console
    39 libbsp_a_SOURCES += ../gp32/console/uart.c ../../shared/console.c \
    40     ../../shared/console_select.c \
    41     ../../shared/console_read.c ../../shared/console_write.c \
    42     ../../shared/console_control.c
     44libbsp_a_SOURCES += console/uart.c
     45libbsp_a_SOURCES += ../../shared/console.c
     46libbsp_a_SOURCES += ../../shared/console_select.c
     47libbsp_a_SOURCES += ../../shared/console_read.c
     48libbsp_a_SOURCES += ../../shared/console_write.c
     49libbsp_a_SOURCES += ../../shared/console_control.c
    4350# IRQ
    4451include_bsp_HEADERS += ../../shared/include/irq-generic.h \
     
    5360libbsp_a_SOURCES += ../shared/abort/abort.c
    5461# smc
    55 libbsp_a_SOURCES += ../gp32/smc/smc.c ../gp32/smc/smc.h
     62libbsp_a_SOURCES += smc/smc.c
     63libbsp_a_SOURCES += smc/smc.h
    5664
    5765# Cache
  • c/src/lib/libbsp/arm/smdk2410/README

    rcc1add7b r3f5e0961  
    11SMDK2410 is a standard evaluation board for samsung s3c2410 ARM9 CPU
    22
    3 This BSP was first developed by xiajiashan <ximenchuixue4016@sina.com>, based on gp32 Apr/2007
    4 ZhiMing, Zhang <paopaoerzhang@gmail.com> fix timer defect and run it on skeyey
    5 Ray, Xu merge this bsp with gp32 on Apr/2008
     3This BSP was first developed by xiajiashan <ximenchuixue4016@sina.com>,
     4based on gp32 Apr/2007.
     5ZhiMing, Zhang <paopaoerzhang@gmail.com> fix timer defect and run
     6it on skeye. Ray, Xu merged this bsp with gp32 on Apr/2008
    67
    7 pls refer to wiki on how to run this BSP on skyeye.
     8This BSP can be run on the Skyeye simulator.
    89
  • c/src/lib/libbsp/arm/smdk2410/include/bsp.h

    rcc1add7b r3f5e0961  
    22 * @file
    33 * @ingroup arm_smdk2410
    4  * @brief Global BSP definitions.
     4 * @brief Global BSP definitons.
    55 */
    66
    7 /*-------------------------------------------------------------------------+
    8 | bsp.h - ARM BSP
    9 |
    10 | Copyright (c) Ray,Xu  mailto:ray.cn AT gmail dot com
    11 |
    12 |  The license and distribution terms for this file may be
    13 |  found in the file LICENSE in this distribution or at
    14 |  http://www.rtems.org/license/LICENSE.
    15 +--------------------------------------------------------------------------*/
    16 
     7/*
     8 *  Copyright (c) Canon Research France SA.]
     9 *  Emmanuel Raguet, mailto:raguet@crf.canon.fr
     10 *
     11 *  The license and distribution terms for this file may be
     12 *  found in the file LICENSE in this distribution or at
     13 *  http://www.rtems.org/license/LICENSE.
     14 */
    1715
    1816#ifndef LIBBSP_ARM_SMDK2410_BSP_H
     
    2220#include <bsp/default-initial-extension.h>
    2321
     22#include <rtems.h>
     23#include <rtems/iosupp.h>
     24#include <rtems/console.h>
     25#include <rtems/clockdrv.h>
     26#include <s3c24xx.h>
     27
    2428#ifdef __cplusplus
    2529extern "C" {
    2630#endif
    2731
     32#define BSP_FEATURE_IRQ_EXTENSION
     33
    2834/**
    29  * @defgroup arm_smdk2410 SMDK2410 Support
    30  * @ingroup bsp_arm
    31  * @brief SMDK2410 Support Package
     35 * @brief functions to get the differents s3c2400 clks
     36 * @{
    3237 */
    3338
     39uint32_t get_FCLK(void);
     40uint32_t get_HCLK(void);
     41uint32_t get_PCLK(void);
     42uint32_t get_UCLK(void);
     43
     44/** @} */
     45
     46/* What is the input clock freq in hertz? */
     47/** @brief 12 MHz oscillator */
     48#define BSP_OSC_FREQ  12000000
     49/** @brief FCLK=133Mhz */
     50#define M_MDIV 81
     51#define M_PDIV 2
     52#define M_SDIV 1
     53/** @brief HCLK=FCLK/2, PCLK=FCLK/2 */
     54#define M_CLKDIVN 2
     55/** @brief enable refresh */
     56#define REFEN   0x1
     57/** @brief CBR(CAS before RAS)/auto refresh */
     58#define TREFMD  0x0
     59/** @brief 2 clk */
     60#define Trp     0x0
     61/** @brief 7 clk */
     62#define Trc     0x3
     63/** @brief 3 clk */
     64#define Tchr    0x2
     65
    3466/**
    35  *  This file will not be pre-installed because the smdk2410 BSP uses
    36  *  the bsp.h in gp32 currently.  This file is a placeholder. If you
    37  *  need to add something specical for your 2410 BSP please override
    38  *  this file with your own and change Makefile.am
     67 * @brief This BSP provides its own IDLE thread to override the RTEMS one.
     68 *
     69 *  So we prototype it and define the constant confdefs.h expects
     70 *  to configure a BSP specific one.
    3971 */
     72void *bsp_idle_thread(uintptr_t ignored);
     73
     74/** @} */
     75
     76#define BSP_IDLE_TASK_BODY bsp_idle_thread
    4077
    4178#ifdef __cplusplus
  • c/src/lib/libbsp/arm/smdk2410/preinstall.am

    rcc1add7b r3f5e0961  
    3838PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
    3939
    40 $(PROJECT_INCLUDE)/bsp.h: ../gp32/include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
     40$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
    4141        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
    4242PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
    4343
    44 $(PROJECT_INCLUDE)/smc.h: ../gp32/smc/smc.h $(PROJECT_INCLUDE)/$(dirstamp)
     44$(PROJECT_INCLUDE)/smc.h: smc/smc.h $(PROJECT_INCLUDE)/$(dirstamp)
    4545        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/smc.h
    4646PREINSTALL_FILES += $(PROJECT_INCLUDE)/smc.h
  • c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c

    rcc1add7b r3f5e0961  
    1717  SKYEYE_MAGIC_ADDRESS = 0xff;
    1818#else
    19   /* XXX TODO this code is copied from gp32.. move it to a shared place */
     19  /* TODO: This code was initially copied from the gp32 BSP. That BSP has
     20   * been obsoleted and removed but this code may still benefit from being
     21   * in a shared place.
     22   */
    2023  rtems_interrupt_level level;
    2124
  • c/src/lib/libbsp/arm/smdk2410/startup/memmap.c

    rcc1add7b r3f5e0961  
    11/*
    2  *  GP32 Memory Map
    3  *
     2 *  SMDK2410 Memory Map
     3 */
     4
     5/*
    46 *  Copyright (c) 2004 by Cogent Computer Systems
    57 *  Written by Jay Monkman <jtm@lopingdog.com>
     
    2022    {0x30000000, 0x30000000,   32,  MMU_CACHE_WTHROUGH}, /* SDRAM W cache */
    2123    {0x32000000, 0x32000000,   32,  MMU_CACHE_NONE},     /* SDRAM W/O cache */
    22     {0x48000000, 0x48000000,   256, MMU_CACHE_NONE},    /* Internals Regs - */
    23     {0x50000000, 0x50000000,   256, MMU_CACHE_NONE},    /* Internal Regs - */
    24     {0x00000000, 0x00000000,   0,    0}                /* The end */
     24    {0x48000000, 0x48000000,   256, MMU_CACHE_NONE},     /* Internals Regs - */
     25    {0x50000000, 0x50000000,   256, MMU_CACHE_NONE},     /* Internal Regs - */
     26    {0x00000000, 0x00000000,   0,    0}                  /* The end */
    2527};
Note: See TracChangeset for help on using the changeset viewer.