ppc4xx: Update CPCI405 variants handling
PATCH 1/3 ppc4xx: Update CPCI405 variants handling
From: Matthias Fuchs <[email protected]>
This patch replaces the BOARD_REVISION variable in include/config.mk by a using a temporary include file in the platform directory.
The former way does not work anymore and the latter is alos used by some other boards.
--- Makefile | 8 +++++--- board/esd/cpci405/config.mk | 16 ++-------------- 2 files changed, 7 insertions(+), 17 deletions(-)
Makefile +5 -3
@@ -1242,12 +1242,14 @@ CMS700_config: unconfig CPCI2DP_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci2dp esd -CPCI405_config \ -CPCI4052_config \ +CPCI405_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd + +CPCI4052_config \ CPCI405DT_config \ CPCI405AB_config: unconfig + @echo "TEXT_BASE = 0xFFFC0000" > $(obj)board/esd/cpci405/config.tmp @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpci405 esd - @echo "BOARD_REVISION = $(@:_config=)" >> $(obj)include/config.mk CPCIISER4_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx cpciiser4 esd
board/esd/cpci405/config.mk +2 -14
@@ -21,20 +21,8 @@ # MA 02111-1307 USA # -# -# esd CPCI405 boards -# +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp -ifeq ($(BOARD_REVISION),CPCI4052) -TEXT_BASE = 0xFFFC0000 -else -ifeq ($(BOARD_REVISION),CPCI405DT) -TEXT_BASE = 0xFFFC0000 -else -ifeq ($(BOARD_REVISION),CPCI405AB) -TEXT_BASE = 0xFFFC0000 -else +ifndef TEXT_BASE TEXT_BASE = 0xFFFD0000 endif -endif -endif
Signature · 1 line
1.5.3
PATCH 2/3 ppc4xx: Cleanup CPCI405 linker script
From: Matthias Fuchs <[email protected]>
--- board/esd/cpci405/u-boot.lds | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-)
board/esd/cpci405/u-boot.lds +0 -15
@@ -57,22 +57,7 @@ SECTIONS .plt : { *(.plt) } .text : { - /* WARNING - the following is hand-optimized to fit within */ - /* the sector layout of our flash chips! XXX FIXME XXX */ - cpu/ppc4xx/start.o (.text) - cpu/ppc4xx/traps.o (.text) - cpu/ppc4xx/interrupts.o (.text) - cpu/ppc4xx/4xx_uart.o (.text) - cpu/ppc4xx/cpu_init.o (.text) - cpu/ppc4xx/speed.o (.text) - common/dlmalloc.o (.text) - lib_generic/crc32.o (.text) - lib_ppc/extable.o (.text) - lib_generic/zlib.o (.text) - -/* . = env_offset;*/ -/* common/environment.o(.text)*/ *(.text) *(.fixup)
Signature · 1 line
1.5.3
PATCH 3/3 ppc4xx: Update CPCI405(AB) configuration
From: Matthias Fuchs <[email protected]>
This patch add FDT support and command line editing capabilities for CPCI405 and CPCI405AB boards.
--- include/configs/CPCI4052.h | 6 ++++++ include/configs/CPCI405AB.h | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
include/configs/CPCI4052.h +6 -0
@@ -146,6 +146,8 @@#define CFG_HZ 1000/* decrementer freq: 1 ms ticks */ +#define CONFIG_CMDLINE_EDITING /* add command line history */ +#define CONFIG_LOOPW 1/* enable loopw command */ #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
@@ -219,6 +221,10 @@* the maximum mapped by the Linux kernel during initialization. */ #define CFG_BOOTMAPSZ (8 << 20)/* Initial Memory map for Linux */ + +#define CONFIG_OF_LIBFDT +#define CONFIG_OF_BOARD_SETUP +/*----------------------------------------------------------------------- * FLASH organization */
include/configs/CPCI405AB.h +6 -0
@@ -144,6 +144,8 @@#define CFG_HZ 1000/* decrementer freq: 1 ms ticks */ +#define CONFIG_CMDLINE_EDITING /* add command line history */ +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_VERSION_VARIABLE 1/* include version env variable */
@@ -215,6 +217,10 @@* the maximum mapped by the Linux kernel during initialization. */ #define CFG_BOOTMAPSZ (8 << 20)/* Initial Memory map for Linux */ + +#define CONFIG_OF_LIBFDT +#define CONFIG_OF_BOARD_SETUP +/*----------------------------------------------------------------------- * FLASH organization */
Signature · 1 line
1.5.3
PATCH 1/3 ppc4xx: Update CPCI405 variants handling
In reply to matthias.fuchs at esd-electronics.comQuoted 7 lines · matthias.fuchs at esd-electronics.com
From: Matthias Fuchs <[email protected]>
This patch replaces the
BOARD_REVISIONvariable ininclude/config.mkby a using a temporary include file in the platform directory.The former way does not work anymore and the latter is alos used by some other boards.
Applied to u-boot-ppc4xx (all 3 patches from this series). Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================