Message ID | 1416197984-15118-1-git-send-email-iwamatsu@nigauri.org |
---|---|
State | Accepted |
Delegated to: | Nobuhiro Iwamatsu |
Headers | show |
Hi Nobuhiro, The sh7753evb board fails to build since commit 570dd7f441c2d2d2e83a9345608801c92e7d2c6f Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Date: Fri Nov 14 12:52:47 2014 +0900 sh: Move SH_32BIT to Kconfig This moves SH_32BIT to Kconfig, and removes SH_32BIT from config files. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Building sh7753evb board... make: *** [u-boot] Error 1 size: './u-boot': No such file board/renesas/sh7753evb/sh7753evb.c: In function 'set_pmb_on_board_init': board/renesas/sh7753evb/sh7753evb.c:139:2: warning: implicit declaration of function 'PMB_ADDR_BASE' [-Wimplicit-function-declaration] board/renesas/sh7753evb/sh7753evb.c:140:2: warning: implicit declaration of function 'PMB_DATA_BASE' [-Wimplicit-function-declaration] board/renesas/sh7753evb/sh7753evb.c:144:2: warning: implicit declaration of function 'mk_pmb_addr_val' [-Wimplicit-function-declaration] board/renesas/sh7753evb/sh7753evb.c:145:2: warning: implicit declaration of function 'mk_pmb_data_val' [-Wimplicit-function-declaration] board/renesas/sh7753evb/built-in.o: In function `init_usb_phy': /home/yamada/workspace/u-boot-org/board/renesas/sh7753evb/sh7753evb.c:77: undefined reference to `PMB_ADDR_BASE' /home/yamada/workspace/u-boot-org/board/renesas/sh7753evb/sh7753evb.c:77: undefined reference to `PMB_DATA_BASE' /home/yamada/workspace/u-boot-org/board/renesas/sh7753evb/sh7753evb.c:77: undefined reference to `mk_pmb_addr_val' /home/yamada/workspace/u-boot-org/board/renesas/sh7753evb/sh7753evb.c:77: undefined reference to `mk_pmb_data_val' make: *** [u-boot] Error 1 Could you check it out, please? The cause of the error seems SH_32BIT depends on CPU_SH4A but TARGET_SH7753EVB is selecting CPU_SH4, CPU_SH4A. Best Regards Masahiro Yamada On Mon, 17 Nov 2014 13:19:44 +0900 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> wrote: > This moves SH_32BIT to Kconfig, and removes SH_32BIT from config > files. > > Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> > --- > arch/sh/Kconfig | 9 +++++++++ > configs/sh7752evb_defconfig | 1 + > configs/sh7753evb_defconfig | 1 + > configs/sh7757lcr_defconfig | 1 + > configs/sh7785lcr_32bit_defconfig | 2 +- > include/configs/sh7752evb.h | 1 - > include/configs/sh7753evb.h | 1 - > include/configs/sh7757lcr.h | 1 - > 8 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig > index 685406b..ff8f5b5 100644 > --- a/arch/sh/Kconfig > +++ b/arch/sh/Kconfig > @@ -18,6 +18,15 @@ config CPU_SH4A > bool > select CPU_SH4 > > +config SH_32BIT > + bool "32bit mode" > + depends on CPU_SH4A > + default n > + help > + SH4A has 2 physical memory maps. This use 32bit mode. > + And this is board specific. Please check your board if you > + want to use this. > + > choice > prompt "Target select" > > diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig > index 124154c..1f7c6d0 100644 > --- a/configs/sh7752evb_defconfig > +++ b/configs/sh7752evb_defconfig > @@ -1,2 +1,3 @@ > CONFIG_SH=y > +CONFIG_SH_32BIT=y > CONFIG_TARGET_SH7752EVB=y > diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig > index 9ff4121..35809e9 100644 > --- a/configs/sh7753evb_defconfig > +++ b/configs/sh7753evb_defconfig > @@ -1,2 +1,3 @@ > CONFIG_SH=y > +CONFIG_SH_32BIT=y > CONFIG_TARGET_SH7753EVB=y > diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig > index 3066d97..ffcf961 100644 > --- a/configs/sh7757lcr_defconfig > +++ b/configs/sh7757lcr_defconfig > @@ -1,2 +1,3 @@ > CONFIG_SH=y > +CONFIG_SH_32BIT=y > CONFIG_TARGET_SH7757LCR=y > diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig > index 7cf93b4..31b84ff 100644 > --- a/configs/sh7785lcr_32bit_defconfig > +++ b/configs/sh7785lcr_32bit_defconfig > @@ -1,3 +1,3 @@ > -CONFIG_SYS_EXTRA_OPTIONS="SH_32BIT=1" > CONFIG_SH=y > +CONFIG_SH_32BIT=y > CONFIG_TARGET_SH7785LCR=y > diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h > index f06abbc..2d509a9 100644 > --- a/include/configs/sh7752evb.h > +++ b/include/configs/sh7752evb.h > @@ -10,7 +10,6 @@ > #define __SH7752EVB_H > > #undef DEBUG > -#define CONFIG_SH_32BIT 1 > #define CONFIG_CPU_SH7752 1 > #define CONFIG_SH7752EVB 1 > > diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h > index e400db0..c31dd7a 100644 > --- a/include/configs/sh7753evb.h > +++ b/include/configs/sh7753evb.h > @@ -10,7 +10,6 @@ > #define __SH7753EVB_H > > #undef DEBUG > -#define CONFIG_SH_32BIT 1 > #define CONFIG_CPU_SH7753 1 > #define CONFIG_SH7753EVB 1 > > diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h > index 08bff1d..36afd5f 100644 > --- a/include/configs/sh7757lcr.h > +++ b/include/configs/sh7757lcr.h > @@ -10,7 +10,6 @@ > #define __SH7757LCR_H > > #undef DEBUG > -#define CONFIG_SH_32BIT 1 > #define CONFIG_CPU_SH7757 1 > #define CONFIG_SH7757LCR 1 > #define CONFIG_SH7757LCR_DDR_ECC 1 > -- > 2.1.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 685406b..ff8f5b5 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -18,6 +18,15 @@ config CPU_SH4A bool select CPU_SH4 +config SH_32BIT + bool "32bit mode" + depends on CPU_SH4A + default n + help + SH4A has 2 physical memory maps. This use 32bit mode. + And this is board specific. Please check your board if you + want to use this. + choice prompt "Target select" diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index 124154c..1f7c6d0 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -1,2 +1,3 @@ CONFIG_SH=y +CONFIG_SH_32BIT=y CONFIG_TARGET_SH7752EVB=y diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index 9ff4121..35809e9 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -1,2 +1,3 @@ CONFIG_SH=y +CONFIG_SH_32BIT=y CONFIG_TARGET_SH7753EVB=y diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index 3066d97..ffcf961 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -1,2 +1,3 @@ CONFIG_SH=y +CONFIG_SH_32BIT=y CONFIG_TARGET_SH7757LCR=y diff --git a/configs/sh7785lcr_32bit_defconfig b/configs/sh7785lcr_32bit_defconfig index 7cf93b4..31b84ff 100644 --- a/configs/sh7785lcr_32bit_defconfig +++ b/configs/sh7785lcr_32bit_defconfig @@ -1,3 +1,3 @@ -CONFIG_SYS_EXTRA_OPTIONS="SH_32BIT=1" CONFIG_SH=y +CONFIG_SH_32BIT=y CONFIG_TARGET_SH7785LCR=y diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index f06abbc..2d509a9 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -10,7 +10,6 @@ #define __SH7752EVB_H #undef DEBUG -#define CONFIG_SH_32BIT 1 #define CONFIG_CPU_SH7752 1 #define CONFIG_SH7752EVB 1 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index e400db0..c31dd7a 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -10,7 +10,6 @@ #define __SH7753EVB_H #undef DEBUG -#define CONFIG_SH_32BIT 1 #define CONFIG_CPU_SH7753 1 #define CONFIG_SH7753EVB 1 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 08bff1d..36afd5f 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -10,7 +10,6 @@ #define __SH7757LCR_H #undef DEBUG -#define CONFIG_SH_32BIT 1 #define CONFIG_CPU_SH7757 1 #define CONFIG_SH7757LCR 1 #define CONFIG_SH7757LCR_DDR_ECC 1
This moves SH_32BIT to Kconfig, and removes SH_32BIT from config files. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> --- arch/sh/Kconfig | 9 +++++++++ configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + configs/sh7785lcr_32bit_defconfig | 2 +- include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - 8 files changed, 13 insertions(+), 4 deletions(-)