[U-Boot] [PATCH 1/3] Build: Implement sentinel to pass board options

Marek Vasut

3 Oct 2010 3 Oct '10

6:34 p.m.

With this implementation, the sentinel character in TARGET name is interpreted as an option and expanded to CONFIG_MK_xxx.

Signed-off-by: Marek Vasut marek.vasut@gmail.com --- boards.cfg | 1 + mkconfig | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/boards.cfg b/boards.cfg index 62bcca8..96c8890 100644 --- a/boards.cfg +++ b/boards.cfg @@ -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 # diff --git a/mkconfig b/mkconfig index b661071..62d6bd6 100755 --- a/mkconfig +++ b/mkconfig @@ -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"

-- 1.7.1

Show replies by date

Marek Vasut

3 Oct 3 Oct

6:34 p.m.

New subject: [U-Boot] [PATCH 2/3] Build: PXA: Fix Vpac270 build variants

Signed-off-by: Marek Vasut marek.vasut@gmail.com --- Makefile | 16 ---------------- board/vpac270/vpac270.c | 2 +- boards.cfg | 3 +++ include/configs/vpac270.h | 12 ++++++------ 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile index 929ae78..59067ee 100644 --- a/Makefile +++ b/Makefile @@ -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 ######################################################################### diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c index 91d8580..0baa8e4 100644 --- a/board/vpac270/vpac270.c +++ b/board/vpac270/vpac270.c @@ -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 diff --git a/boards.cfg b/boards.cfg index 96c8890..93ee5ba 100644 --- a/boards.cfg +++ b/boards.cfg @@ -65,6 +65,9 @@ lubbock arm pxa palmld arm pxa palmtc arm pxa pleb2 arm pxa +vpac270@NOR@128M arm pxa +vpac270@NOR@256M arm pxa +vpac270@OND@256M arm pxa xaeniax arm pxa xm250 arm pxa zipitz2 arm pxa diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 0bb0db4..399040c 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -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

-- 1.7.1

Wolfgang Denk

10:27 p.m.

New subject: [U-Boot] [PATCH 2/3] Build: PXA: Fix Vpac270 build variants

Dear Marek Vasut,

In message 1286123674-13461-2-git-send-email-marek.vasut@gmail.com you wrote:

...

Signed-off-by: Marek Vasut marek.vasut@gmail.com

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

Marek Vasut

6:34 p.m.

New subject: [U-Boot] [PATCH 3/3] Build: PXA: Fix TrizepsIV build variants

Signed-off-by: Marek Vasut marek.vasut@gmail.com --- Makefile | 8 -------- board/trizepsiv/conxs.c | 2 +- boards.cfg | 2 ++ include/configs/trizepsiv.h | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile index 59067ee..051b66b 100644 --- a/Makefile +++ b/Makefile @@ -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 ######################################################################### diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c index 7fac73d..0c67367 100644 --- a/board/trizepsiv/conxs.c +++ b/board/trizepsiv/conxs.c @@ -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" diff --git a/boards.cfg b/boards.cfg index 93ee5ba..25b4554 100644 --- a/boards.cfg +++ b/boards.cfg @@ -65,6 +65,8 @@ lubbock arm pxa palmld arm pxa palmtc arm pxa pleb2 arm pxa +trizepsiv@POLARIS arm pxa +trizepsiv arm pxa vpac270@NOR@128M arm pxa vpac270@NOR@256M arm pxa vpac270@OND@256M arm pxa diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index 4743495..8370274 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -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

-- 1.7.1

Marek Vasut

6:38 p.m.

New subject: [U-Boot] [PATCH 3/3] Build: PXA: Fix TrizepsIV build variants

Dne Ne 3. října 2010 18:34:34 Marek Vasut napsal(a):

...

Signed-off-by: Marek Vasut marek.vasut@gmail.com

Missing MAKEALL entry removal handled in my tree ... will push this with a final version.

...

Makefile | 8 -------- board/trizepsiv/conxs.c | 2 +- boards.cfg | 2 ++ include/configs/trizepsiv.h | 6 +++--- 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile index 59067ee..051b66b 100644 --- a/Makefile +++ b/Makefile @@ -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 ######################################################################### diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c index 7fac73d..0c67367 100644 --- a/board/trizepsiv/conxs.c +++ b/board/trizepsiv/conxs.c @@ -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" diff --git a/boards.cfg b/boards.cfg index 93ee5ba..25b4554 100644 --- a/boards.cfg +++ b/boards.cfg @@ -65,6 +65,8 @@ lubbock arm pxa palmld arm pxa palmtc arm pxa pleb2 arm pxa +trizepsiv@POLARIS arm pxa +trizepsiv arm pxa vpac270@NOR@128M arm pxa vpac270@NOR@256M arm pxa vpac270@OND@256M arm pxa diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index 4743495..8370274 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -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

Wolfgang Denk

10:28 p.m.

New subject: [U-Boot] [PATCH 3/3] Build: PXA: Fix TrizepsIV build variants

Dear Marek Vasut,

In message 1286123674-13461-3-git-send-email-marek.vasut@gmail.com you wrote:

...

Signed-off-by: Marek Vasut marek.vasut@gmail.com

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

-- 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@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 Galaxy

Wolfgang Denk

10:26 p.m.

New subject: [U-Boot] [PATCH 1/3] Build: Implement sentinel to pass board options

Dear Marek Vasut,

In message 1286123674-13461-1-git-send-email-marek.vasut@gmail.com 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

-- 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@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.

5332

Age (days ago)

5332

Last active (days ago)

List overview

Download

6 comments

2 participants

tags (0)

participants (2)

Marek Vasut
Wolfgang Denk