diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-07-27 15:36:11 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-07-28 10:12:36 +0200 |
| commit | 0db7c550aca1520899702cd170738481096af667 (patch) | |
| tree | 43c582c5e62a48a04c556e107b87f9176a840ad1 /c/src/lib | |
| parent | bsp/qoriq: Simplify initialization (diff) | |
| download | rtems-0db7c550aca1520899702cd170738481096af667.tar.bz2 | |
bsp/qoriq: New BSP names
Due to the FDT support we can now reduce the BSP variants. Use the
processor core to define the BSP variants.
Update #3082.
Update #3085.
Diffstat (limited to 'c/src/lib')
13 files changed, 28 insertions, 49 deletions
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am index 93473ab280..f24b0ca060 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am @@ -43,9 +43,8 @@ dist_project_lib_DATA += startup/linkcmds \ ../shared/startup/linkcmds.base \ startup/linkcmds.qoriq_core_0 \ startup/linkcmds.qoriq_core_1 \ - startup/linkcmds.qoriq_p1020rdb \ - startup/linkcmds.qoriq_t2080rdb \ - startup/linkcmds.qoriq_t4240rdb + startup/linkcmds.qoriq_e500 \ + startup/linkcmds.qoriq_e6500_32 noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = diff --git a/c/src/lib/libbsp/powerpc/qoriq/configure.ac b/c/src/lib/libbsp/powerpc/qoriq/configure.ac index bc97d73cdf..0a6f1b5083 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/configure.ac +++ b/c/src/lib/libbsp/powerpc/qoriq/configure.ac @@ -28,21 +28,21 @@ RTEMS_BSPOPTS_SET([PPC_EXC_CONFIG_BOOKE_ONLY],[*],[1]) RTEMS_BSPOPTS_HELP([PPC_EXC_CONFIG_BOOKE_ONLY], [only support Book E exception types]) -RTEMS_BSPOPTS_SET([PPC_CACHE_ALIGNMENT],[qoriq_t*],[64]) +RTEMS_BSPOPTS_SET([PPC_CACHE_ALIGNMENT],[qoriq_e6500*],[64]) RTEMS_BSPOPTS_SET([PPC_CACHE_ALIGNMENT],[*],[]) RTEMS_BSPOPTS_HELP([PPC_CACHE_ALIGNMENT],[the cache alignment]) RTEMS_BSPOPTS_SET([PPC_CACHE_DATA_L1_SIZE],[*],[(32 * 1024)]) RTEMS_BSPOPTS_HELP([PPC_CACHE_DATA_L1_SIZE],[the L1 data cache size]) -RTEMS_BSPOPTS_SET([PPC_CACHE_DATA_L2_SIZE],[qoriq_t*],[(2048 * 1024)]) +RTEMS_BSPOPTS_SET([PPC_CACHE_DATA_L2_SIZE],[qoriq_e6500*],[(2048 * 1024)]) RTEMS_BSPOPTS_SET([PPC_CACHE_DATA_L2_SIZE],[*],[(256 * 1024)]) RTEMS_BSPOPTS_HELP([PPC_CACHE_DATA_L2_SIZE],[the L2 data cache size]) RTEMS_BSPOPTS_SET([PPC_CACHE_INSTRUCTION_L1_SIZE],[*],[(32 * 1024)]) RTEMS_BSPOPTS_HELP([PPC_CACHE_INSTRUCTION_L1_SIZE],[the L1 instruction cache size]) -RTEMS_BSPOPTS_SET([PPC_CACHE_INSTRUCTION_L2_SIZE],[qoriq_t*],[(2048 * 1024)]) +RTEMS_BSPOPTS_SET([PPC_CACHE_INSTRUCTION_L2_SIZE],[qoriq_e6500*],[(2048 * 1024)]) RTEMS_BSPOPTS_SET([PPC_CACHE_INSTRUCTION_L2_SIZE],[*],[(256 * 1024)]) RTEMS_BSPOPTS_HELP([PPC_CACHE_INSTRUCTION_L2_SIZE],[the L2 instruction cache size]) @@ -58,11 +58,11 @@ RTEMS_BSPOPTS_HELP([BSP_FDT_BLOB_SIZE_MAX],[maximum size of the FDT blob in byte RTEMS_BSPOPTS_SET([BSP_FDT_BLOB_READ_ONLY],[*],[1]) RTEMS_BSPOPTS_HELP([BSP_FDT_BLOB_READ_ONLY],[place the FDT blob into the read-only data area]) -RTEMS_BSPOPTS_SET([QORIQ_CPU_COUNT],[qoriq_t*],[24]) +RTEMS_BSPOPTS_SET([QORIQ_CPU_COUNT],[qoriq_e6500*],[24]) RTEMS_BSPOPTS_SET([QORIQ_CPU_COUNT],[*],[2]) RTEMS_BSPOPTS_HELP([QORIQ_CPU_COUNT],[maximum virtual processor count]) -RTEMS_BSPOPTS_SET([QORIQ_THREAD_COUNT],[qoriq_t*],[2]) +RTEMS_BSPOPTS_SET([QORIQ_THREAD_COUNT],[qoriq_e6500*],[2]) RTEMS_BSPOPTS_SET([QORIQ_THREAD_COUNT],[*],[1]) RTEMS_BSPOPTS_HELP([QORIQ_THREAD_COUNT],[the number of threads per processor]) @@ -108,31 +108,31 @@ RTEMS_BSPOPTS_HELP([QORIQ_INTERCOM_AREA_BEGIN],[inter-processor communication ar RTEMS_BSPOPTS_SET([QORIQ_INTERCOM_AREA_SIZE],[*],[0x1000000]) RTEMS_BSPOPTS_HELP([QORIQ_INTERCOM_AREA_SIZE],[inter-processor communication area size]) -RTEMS_BSPOPTS_SET([QORIQ_TLB1_ENTRY_COUNT],[qoriq_t*],[64]) +RTEMS_BSPOPTS_SET([QORIQ_TLB1_ENTRY_COUNT],[qoriq_e6500*],[64]) RTEMS_BSPOPTS_SET([QORIQ_TLB1_ENTRY_COUNT],[*],[16]) RTEMS_BSPOPTS_HELP([QORIQ_TLB1_ENTRY_COUNT],[TLB1 entry count]) -RTEMS_BSPOPTS_SET([QORIQ_INITIAL_HID0],[qoriq_t*],[0x40000000]) +RTEMS_BSPOPTS_SET([QORIQ_INITIAL_HID0],[qoriq_e6500*],[0x40000000]) RTEMS_BSPOPTS_SET([QORIQ_INITIAL_HID0],[*],[]) RTEMS_BSPOPTS_HELP([QORIQ_INITIAL_HID0],[initial HID0 value (EN_L2MMU_MHD is set by default on the T-series)]) -RTEMS_BSPOPTS_SET([QORIQ_INITIAL_MSR],[qoriq_t*],[0x02002200]) +RTEMS_BSPOPTS_SET([QORIQ_INITIAL_MSR],[qoriq_e6500*],[0x02002200]) RTEMS_BSPOPTS_SET([QORIQ_INITIAL_MSR],[*],[0x02000200]) RTEMS_BSPOPTS_HELP([QORIQ_INITIAL_MSR],[initial MSR value]) -RTEMS_BSPOPTS_SET([QORIQ_INITIAL_SPEFSCR],[qoriq_t*],[]) +RTEMS_BSPOPTS_SET([QORIQ_INITIAL_SPEFSCR],[qoriq_e6500*],[]) RTEMS_BSPOPTS_SET([QORIQ_INITIAL_SPEFSCR],[*],[0x00000000]) RTEMS_BSPOPTS_HELP([QORIQ_INITIAL_SPEFSCR],[initial SPEFSCR value]) -RTEMS_BSPOPTS_SET([QORIQ_INITIAL_BUCSR],[qoriq_t*],[0x01400201]) +RTEMS_BSPOPTS_SET([QORIQ_INITIAL_BUCSR],[qoriq_e6500*],[0x01400201]) RTEMS_BSPOPTS_SET([QORIQ_INITIAL_BUCSR],[*],[]) RTEMS_BSPOPTS_HELP([QORIQ_INITIAL_BUCSR],[initial BUCSR value]) -RTEMS_BSPOPTS_SET([QORIQ_MMU_DEVICE_MAS7],[qoriq_t*],[0xf]) +RTEMS_BSPOPTS_SET([QORIQ_MMU_DEVICE_MAS7],[qoriq_e6500*],[0xf]) RTEMS_BSPOPTS_SET([QORIQ_MMU_DEVICE_MAS7],[*],[0x0]) RTEMS_BSPOPTS_HELP([QORIQ_MMU_DEVICE_MAS7],[MAS7 value for device TLB1 entries]) -RTEMS_BSPOPTS_SET([QORIQ_HAS_HYPERVISOR_MODE],[qoriq_t*],[1]) +RTEMS_BSPOPTS_SET([QORIQ_HAS_HYPERVISOR_MODE],[qoriq_e6500*],[1]) RTEMS_BSPOPTS_SET([QORIQ_HAS_HYPERVISOR_MODE],[*],[]) RTEMS_BSPOPTS_HELP([QORIQ_HAS_HYPERVISOR_MODE],[defined if the processor core has a hypervisor mode]) @@ -144,12 +144,11 @@ RTEMS_BSPOPTS_SET([QORIQ_CLOCK_TIMECOUNTER],[qoriq_core_1],[5]) RTEMS_BSPOPTS_SET([QORIQ_CLOCK_TIMECOUNTER],[*],[1]) RTEMS_BSPOPTS_HELP([QORIQ_CLOCK_TIMECOUNTER],[global timer used for the timecounter, 0..3 maps to A0..A3, and 4..7 maps to B0..B3]) -RTEMS_BSPOPTS_SET([QORIQ_CHIP_VARIANT],[qoriq_t2080*],[QORIQ_CHIP_T2080]) -RTEMS_BSPOPTS_SET([QORIQ_CHIP_VARIANT],[qoriq_t4240*],[QORIQ_CHIP_T4240]) -RTEMS_BSPOPTS_SET([QORIQ_CHIP_VARIANT],[*],[QORIQ_CHIP_P1020]) -RTEMS_BSPOPTS_HELP([QORIQ_CHIP_VARIANT],[chip variant, use one of the defines QORIQ_CHIP_P1020, QORIQ_CHIP_T2080 or QORIQ_CHIP_T4240]) +RTEMS_BSPOPTS_SET([QORIQ_CHIP_VARIANT],[qoriq_e6500*],[QORIQ_CHIP('T', 0)]) +RTEMS_BSPOPTS_SET([QORIQ_CHIP_VARIANT],[*],[QORIQ_CHIP('P', 1020)]) +RTEMS_BSPOPTS_HELP([QORIQ_CHIP_VARIANT],[chip variant, use the QORIQ_CHIP('X', 1234) macro]) -RTEMS_BSPOPTS_SET([QORIQ_BUS_CLOCK_DIVIDER],[qoriq_t*],[2]) +RTEMS_BSPOPTS_SET([QORIQ_BUS_CLOCK_DIVIDER],[qoriq_e6500*],[2]) RTEMS_BSPOPTS_SET([QORIQ_BUS_CLOCK_DIVIDER],[*],[1]) RTEMS_BSPOPTS_HELP([QORIQ_BUS_CLOCK_DIVIDER],[divider of the platform clock to get the clock most on-chip peripherals]) diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500-testsuite.tcfg index fb84b55762..fb84b55762 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb-testsuite.tcfg +++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500-testsuite.tcfg diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500.cfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500.cfg new file mode 100644 index 0000000000..91e957d967 --- /dev/null +++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e500.cfg @@ -0,0 +1,3 @@ +# Config file for e500 or e500v2 core based QorIQ chips, e.g. P1020, P2040 + +include $(RTEMS_ROOT)/make/custom/qoriq.inc diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32-testsuite.tcfg index fb84b55762..fb84b55762 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb-testsuite.tcfg +++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32-testsuite.tcfg diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb.cfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32.cfg index 814526d9ac..c0ca412248 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t2080rdb.cfg +++ b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_e6500_32.cfg @@ -1,4 +1,4 @@ -# Config file for T2080RDB +# Config file for e6500 core based QorIQ chips, e.g. T2080, T4240 include $(RTEMS_ROOT)/make/custom/default.cfg diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb.cfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb.cfg deleted file mode 100644 index 66199d5a00..0000000000 --- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_p1020rdb.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Config file for P1020RDB - -include $(RTEMS_ROOT)/make/custom/qoriq.inc diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb-testsuite.tcfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb-testsuite.tcfg deleted file mode 100644 index fb84b55762..0000000000 --- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb-testsuite.tcfg +++ /dev/null @@ -1,5 +0,0 @@ -# -# This is the set of tests which are known to not link on this BSP -# - -include: testdata/dltests-broken-on-this-bsp.tcfg diff --git a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb.cfg b/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb.cfg deleted file mode 100644 index ad8c294a45..0000000000 --- a/c/src/lib/libbsp/powerpc/qoriq/make/custom/qoriq_t4240rdb.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Config file for T4240RDB - -include $(RTEMS_ROOT)/make/custom/qoriq_t2080rdb.cfg diff --git a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am b/c/src/lib/libbsp/powerpc/qoriq/preinstall.am index 2a06e8ea32..85871e65c9 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/preinstall.am +++ b/c/src/lib/libbsp/powerpc/qoriq/preinstall.am @@ -129,15 +129,11 @@ $(PROJECT_LIB)/linkcmds.qoriq_core_1: startup/linkcmds.qoriq_core_1 $(PROJECT_LI $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_core_1 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_core_1 -$(PROJECT_LIB)/linkcmds.qoriq_p1020rdb: startup/linkcmds.qoriq_p1020rdb $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_p1020rdb -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_p1020rdb +$(PROJECT_LIB)/linkcmds.qoriq_e500: startup/linkcmds.qoriq_e500 $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e500 +PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e500 -$(PROJECT_LIB)/linkcmds.qoriq_t2080rdb: startup/linkcmds.qoriq_t2080rdb $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_t2080rdb -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_t2080rdb - -$(PROJECT_LIB)/linkcmds.qoriq_t4240rdb: startup/linkcmds.qoriq_t4240rdb $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_t4240rdb -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_t4240rdb +$(PROJECT_LIB)/linkcmds.qoriq_e6500_32: startup/linkcmds.qoriq_e6500_32 $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.qoriq_e6500_32 +PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.qoriq_e6500_32 diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_p1020rdb b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e500 index 9d1fed2ff2..9d1fed2ff2 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_p1020rdb +++ b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e500 diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e6500_32 index 4117e9763f..4117e9763f 100644 --- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t2080rdb +++ b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e6500_32 diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t4240rdb b/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t4240rdb deleted file mode 100644 index b2f38b789c..0000000000 --- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_t4240rdb +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @file - * - * Memory map for T4240RDB. - */ - -INCLUDE linkcmds.qoriq_t2080rdb |