Build: Implement sentinel to pass board options
PATCH 1/3 Build: Implement sentinel to pass board options
With this implementation, the sentinel character in TARGET name is interpreted as an option and expanded to CONFIG_MK_xxx.
--- boards.cfg | 1 + mkconfig | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
boards.cfg +1 -0
@@ -12,6 +12,7 @@ # # Lines starting with '#' are comments. # Blank lines are ignored. +# Sentinel is used to specify board options. # # To keep the list sorted, use something like #
mkconfig +5 -2
@@ -43,7 +43,10 @@ done [ $# -lt 4 ] && exit 1 [ $# -gt 6 ] && exit 1 -CONFIG_NAME="${1%_config}" +# The sentinel is used to define board options +TARGETS="`echo $1 | sed "s/^[^@]*@//" | sed 's:@: :g'` ${TARGETS}" + +CONFIG_NAME="`echo ${1%_config} | sed 's/@.*$//g'`" [ "${BOARD_NAME}" ] || BOARD_NAME="${CONFIG_NAME}"
@@ -52,7 +55,7 @@ cpu="$3" if [ "$4" = "-" ] ; then board=${BOARD_NAME} else - board="$4" + board="`echo $1 | sed 's/@.*$//g'`" fi [ $# -gt 4 ] && [ "$5" != "-" ] && vendor="$5" [ $# -gt 5 ] && [ "$6" != "-" ] && soc="$6"
Signature · 1 line
1.7.1
PATCH 2/3 Build: PXA: Fix Vpac270 build variants
--- Makefile | 16 ---------------- board/vpac270/vpac270.c | 2 +- boards.cfg | 3 +++ include/configs/vpac270.h | 12 ++++++------ 4 files changed, 10 insertions(+), 23 deletions(-)
Makefile +0 -16
@@ -2187,22 +2187,6 @@ trizepsiv_config : unconfig fi; @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv -vpac270_nor_256M_config \ -vpac270_nor_128M_config \ -vpac270_onenand_config : unconfig - @mkdir -p $(obj)include - @if [ "$(findstring onenand,$@)" ] ; then \ - echo "#define CONFIG_ONENAND_U_BOOT" \ - >>$(obj)include/config.h ; \ - echo "#define CONFIG_256M_U_BOOT" \ - >>$(obj)include/config.h ; \ - fi; - @if [ "$(findstring 256M,$@)" ] ; then \ - echo "#define CONFIG_256M_U_BOOT" \ - >>$(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270 - ######################################################################### ## ARM1136 Systems #########################################################################
board/vpac270/vpac270.c +1 -1
@@ -66,7 +66,7 @@ void dram_init_banksize(void) gd->bd->bi_dram[0 ].start =PHYS_SDRAM_1 ; gd->bd->bi_dram[0 ].size =PHYS_SDRAM_1_SIZE ; -#ifdef CONFIG_256M_U_BOOT +#ifdef CONFIG_MK_256M gd->bd->bi_dram[1 ].start =PHYS_SDRAM_2 ; gd->bd->bi_dram[1 ].size =PHYS_SDRAM_2_SIZE ;#endif
boards.cfg +3 -0
@@ -65,6 +65,9 @@ lubbock arm pxa palmld arm pxa palmtc arm pxa pleb2 arm pxa +vpac270 at NOR@128M arm pxa +vpac270 at NOR@256M arm pxa +vpac270 at OND@256M arm pxa xaeniax arm pxa xm250 arm pxa zipitz2 arm pxa
include/configs/vpac270.h +6 -6
@@ -75,7 +75,7 @@#undef CONFIG_LCD#define CONFIG_CMD_IDE -#ifdef CONFIG_ONENAND_U_BOOT +#ifdef CONFIG_MK_OND #undef CONFIG_CMD_FLASH#define CONFIG_CMD_ONENAND #else
@@ -165,13 +165,13 @@#define PHYS_SDRAM_1 0xa0000000/* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x08000000/* 128 MB */ -#ifdef CONFIG_256M_U_BOOT +#ifdef CONFIG_MK_256M #define PHYS_SDRAM_2 0x80000000/* SDRAM Bank #2 */ #define PHYS_SDRAM_2_SIZE 0x08000000/* 128 MB */ #endif #define CONFIG_SYS_DRAM_BASE 0xa0000000/* CS0 */ -#ifdef CONFIG_256M_U_BOOT +#ifdef CONFIG_MK_256M #define CONFIG_SYS_DRAM_SIZE 0x10000000/* 256 MB DRAM */ #else #define CONFIG_SYS_DRAM_SIZE 0x08000000/* 128 MB DRAM */
@@ -198,7 +198,7 @@#if defined(CONFIG_CMD_FLASH )/* NOR */ #define PHYS_FLASH_1 0x00000000/* Flash Bank #1 */ -#ifdef CONFIG_256M_U_BOOT +#ifdef CONFIG_MK_256M #define PHYS_FLASH_2 0x02000000/* Flash Bank #2 */ #endif
@@ -206,7 +206,7 @@#define CONFIG_FLASH_CFI_DRIVER 1#define CONFIG_SYS_MAX_FLASH_SECT (4 + 255) -#ifdef CONFIG_256M_U_BOOT +#ifdef CONFIG_MK_256M #define CONFIG_SYS_MAX_FLASH_BANKS 2#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 }#else
@@ -308,7 +308,7 @@#define CONFIG_SYS_MSC0_VAL 0x3ffc95fa#define CONFIG_SYS_MSC1_VAL 0x02ccf974#define CONFIG_SYS_MSC2_VAL 0x00000000 -#ifdef CONFIG_256M_U_BOOT +#ifdef CONFIG_MK_256M #define CONFIG_SYS_MDCNFG_VAL 0x8ad30ad3#else #define CONFIG_SYS_MDCNFG_VAL 0x88000ad3
Signature · 1 line
1.7.1
PATCH 2/3 Build: PXA: Fix Vpac270 build variants
Dear Marek Vasut,
Quoted 7 lines · In message <[email protected]> you wrote:
Signed-off-by Marek Vasut <[email protected]>--- Makefile | 16 ---------------- board/vpac270/vpac270.c | 2 +- boards.cfg | 3 +++ include/configs/vpac270.h | 12 ++++++------ 4 files changed, 10 insertions(+), 23 deletions(-)
Please change to use the suggested syntax and repost after support for this was added.
Thanks.
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Presidency: The greased pig in the field game of American politics. - Ambrose Bierce
PATCH 3/3 Build: PXA: Fix TrizepsIV build variants
In reply to Marek Vasut--- Makefile | 8 -------- board/trizepsiv/conxs.c | 2 +- boards.cfg | 2 ++ include/configs/trizepsiv.h | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-)
Makefile +0 -8
@@ -2179,14 +2179,6 @@ scpu_config: unconfig fi @$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive -polaris_config \ -trizepsiv_config : unconfig - @mkdir -p $(obj)include - @if [ "$(findstring polaris,$@)" ] ; then \ - echo "#define CONFIG_POLARIS 1" >>$(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv - ######################################################################### ## ARM1136 Systems #########################################################################
board/trizepsiv/conxs.c +1 -1
@@ -45,7 +45,7 @@ extern struct serial_device serial_ffuart_device;extern struct serial_device serial_btuart_device;extern struct serial_device serial_stuart_device; -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define BOOT_CONSOLE "serial_stuart"#else #define BOOT_CONSOLE "serial_ffuart"
boards.cfg +2 -0
@@ -65,6 +65,8 @@ lubbock arm pxa palmld arm pxa palmtc arm pxa pleb2 arm pxa +trizepsiv at POLARIS arm pxa +trizepsiv arm pxa vpac270 at NOR@128M arm pxa vpac270 at NOR@256M arm pxa vpac270 at OND@256M arm pxa
include/configs/trizepsiv.h +3 -3
@@ -246,7 +246,7 @@#define CONFIG_SYS_GFER1_VAL 0x00000000#define CONFIG_SYS_GFER3_VAL 0x00000020 -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define CONFIG_SYS_GFER0_VAL 0x00000001#define CONFIG_SYS_GFER2_VAL 0x00200000#else
@@ -268,7 +268,7 @@#define CONFIG_SYS_MSC0_VAL 0x4df84df0#define CONFIG_SYS_MSC1_VAL 0x7ff87ff4 -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define CONFIG_SYS_MSC2_VAL 0xa2697ff8#else #define CONFIG_SYS_MSC2_VAL 0xa26936d4
@@ -294,7 +294,7 @@#define CONFIG_NET_MULTI 1#define CONFIG_DRIVER_DM9000 1 -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define CONFIG_DM9000_BASE 0x0C800000#else #define CONFIG_DM9000_BASE 0x08000000
Signature · 1 line
1.7.1
PATCH 3/3 Build: PXA: Fix TrizepsIV build variants
Dne Ne 3. ??jna 2010 18:34:34 Marek Vasut napsal(a):
Quoted 1 line
Signed-off-by Marek Vasut <[email protected]>
Missing MAKEALL entry removal handled in my tree ... will push this with a final version.
Quoted 83 lines
--- Makefile | 8 -------- board/trizepsiv/conxs.c | 2 +- boards.cfg | 2 ++ include/configs/trizepsiv.h | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-)Makefile +0
-8@@ -2179,14 +2179,6 @@ scpu_config: unconfig fi @$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive -polaris_config \ -trizepsiv_config : unconfig - @mkdir -p $(obj)include - @if [ "$(findstring polaris,$@)" ] ; then \ - echo "#define CONFIG_POLARIS 1" >>$(obj)include/config.h ; \ - fi; - @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv - ######################################################################### ## ARM1136 Systems #########################################################################board/trizepsiv/conxs.c +1
-1@@ -45,7 +45,7 @@ extern struct serial_device serial_ffuart_device;extern struct serial_device serial_btuart_device;extern struct serial_device serial_stuart_device; -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define BOOT_CONSOLE "serial_stuart"#else #define BOOT_CONSOLE "serial_ffuart"boards.cfg +2
-0@@ -65,6 +65,8 @@ lubbock arm pxa palmld arm pxa palmtc arm pxa pleb2 arm pxa +trizepsiv at POLARIS arm pxa +trizepsiv arm pxa vpac270 at NOR@128M arm pxa vpac270 at NOR@256M arm pxa vpac270 at OND@256M arm pxainclude/configs/trizepsiv.h +3
-3@@ -246,7 +246,7 @@#define CONFIG_SYS_GFER1_VAL 0x00000000#define CONFIG_SYS_GFER3_VAL 0x00000020 -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define CONFIG_SYS_GFER0_VAL 0x00000001#define CONFIG_SYS_GFER2_VAL 0x00200000#else @@ -268,7 +268,7 @@#define CONFIG_SYS_MSC0_VAL 0x4df84df0#define CONFIG_SYS_MSC1_VAL 0x7ff87ff4 -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define CONFIG_SYS_MSC2_VAL 0xa2697ff8#else #define CONFIG_SYS_MSC2_VAL 0xa26936d4@@ -294,7 +294,7 @@#define CONFIG_NET_MULTI 1#define CONFIG_DRIVER_DM9000 1 -#if CONFIG_POLARIS +#if CONFIG_MK_POLARIS #define CONFIG_DM9000_BASE 0x0C800000#else #define CONFIG_DM9000_BASE 0x08000000
PATCH 3/3 Build: PXA: Fix TrizepsIV build variants
In reply to Marek VasutDear Marek Vasut,
Quoted 7 lines · In message <[email protected]> you wrote:
Signed-off-by Marek Vasut <[email protected]>--- Makefile | 8 -------- board/trizepsiv/conxs.c | 2 +- boards.cfg | 2 ++ include/configs/trizepsiv.h | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-)
Please change to use the suggested syntax and repost after support for this was added.
Thanks.
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Space is big. You just won't believe how vastly, hugely, mind-
bogglingly big it is. I mean, you may think it's a long way down the
road to the drug store, but that's just peanuts to space.
-- The Hitchhiker's Guide to the GalaxyPATCH 1/3 Build: Implement sentinel to pass board options
In reply to Marek VasutDear Marek Vasut,
Quoted 2 lines · In message <[email protected]> you wrote:
With this implementation, the sentinel character in TARGET name is interpreted as an option and expanded to
CONFIG_MK_xxx.
Sorry, but this is not the implementation we discussed in the past.
I know that you are aware of the proposal that was posted here:
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/81138/focus=81332
Please implement this feature according to the referenced spec.
Thanks.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Good morning. This is the telephone company. Due to repairs, we're giving you advance notice that your service will be cut off indefi- nitely at ten o'clock. That's two minutes from now.