| Message ID | 20161127221536.9577-19-vz@mleia.com |
|---|---|
| State | Accepted |
| Commit | 18a40e8470246da3ee4cdef721524140f54cc6c9 |
| Delegated to: | Tom Rini |
| Headers | show |
On 27 November 2016 at 15:15, Vladimir Zapolskiy <vz@mleia.com> wrote: > All SH boards define a checkboard() function which outputs basic board > information on boot, however generic board support requires to define > CONFIG_DISPLAY_BOARDINFO to do that, so define it for the boards. > > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> > --- > include/configs/MigoR.h | 1 + > include/configs/ap325rxa.h | 1 + > include/configs/ap_sh4a_4a.h | 1 + > include/configs/ecovec.h | 1 + > include/configs/espt.h | 1 + > include/configs/mpr2.h | 2 ++ > include/configs/ms7720se.h | 1 + > include/configs/ms7722se.h | 1 + > include/configs/ms7750se.h | 2 ++ > include/configs/r0p7734.h | 1 + > include/configs/r2dplus.h | 2 ++ > include/configs/r7780mp.h | 2 ++ > include/configs/rsk7203.h | 1 + > include/configs/rsk7264.h | 2 ++ > include/configs/rsk7269.h | 2 ++ > include/configs/sh7752evb.h | 1 + > include/configs/sh7753evb.h | 1 + > include/configs/sh7757lcr.h | 1 + > include/configs/sh7763rdp.h | 1 + > include/configs/sh7785lcr.h | 1 + > include/configs/shmin.h | 1 + > 21 files changed, 27 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Nov 28, 2016 at 12:15:30AM +0200, Vladimir Zapolskiy wrote: > All SH boards define a checkboard() function which outputs basic board > information on boot, however generic board support requires to define > CONFIG_DISPLAY_BOARDINFO to do that, so define it for the boards. > > Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index e1338cd..75c5af6 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -17,6 +17,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* SMC9111 */ diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 6e39868..c86ce05 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -20,6 +20,7 @@ #define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTARGS "console=ttySC2,38400" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* SMC9118 */ diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h index d2d9770..4b07f06 100644 --- a/include/configs/ap_sh4a_4a.h +++ b/include/configs/ap_sh4a_4a.h @@ -23,6 +23,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC4,115200" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* Ether */ diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 19514b6..6470327 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -37,6 +37,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* I2C */ diff --git a/include/configs/espt.h b/include/configs/espt.h index e76a4ee..9475740 100644 --- a/include/configs/espt.h +++ b/include/configs/espt.h @@ -23,6 +23,7 @@ #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* SCIF */ diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h index 1a8909a..0d37912 100644 --- a/include/configs/mpr2.h +++ b/include/configs/mpr2.h @@ -22,6 +22,8 @@ #define CONFIG_CPU_SH7720 1 #define CONFIG_MPR2 1 +#define CONFIG_DISPLAY_BOARDINFO + /* U-Boot internals */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_CBSIZE 256 /* Buffer size for input from the Console */ diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index d136726..87f8712 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -21,6 +21,7 @@ #define CONFIG_BOOTFILE "/boot/zImage" #define CONFIG_LOADADDR 0x8E000000 +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index a473eec..181d021 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -18,6 +18,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200 root=1f01" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* SMC9111 */ diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index c0fb16d..6268d73 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -15,6 +15,8 @@ #define CONFIG_MS7750SE 1 #define __LITTLE_ENDIAN__ 1 +#define CONFIG_DISPLAY_BOARDINFO + /* * Command line configuration. */ diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h index 2ae9e02..f7412f0 100644 --- a/include/configs/r0p7734.h +++ b/include/configs/r0p7734.h @@ -23,6 +23,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC3,115200" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* Ether */ diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index a0e0c1c..e8f60b2 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -6,6 +6,8 @@ #define CONFIG_R2DPLUS 1 #define __LITTLE_ENDIAN__ 1 +#define CONFIG_DISPLAY_BOARDINFO + /* * Command line configuration. */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index 9812bc8..baadd87 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -15,6 +15,8 @@ #define CONFIG_SYS_R7780MP_OLD_FLASH 1 #define __LITTLE_ENDIAN__ 1 +#define CONFIG_DISPLAY_BOARDINFO + /* * Command line configuration. */ diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h index 2eb9d31..913cbc2 100644 --- a/include/configs/rsk7203.h +++ b/include/configs/rsk7203.h @@ -19,6 +19,7 @@ #define CONFIG_BOOTARGS "console=ttySC0,115200" #define CONFIG_LOADADDR 0x0C100000 /* RSK7203_SDRAM_BASE + 1MB */ +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h index 55dd2c4..ea60014 100644 --- a/include/configs/rsk7264.h +++ b/include/configs/rsk7264.h @@ -14,6 +14,8 @@ #define CONFIG_CPU_SH7264 1 #define CONFIG_RSK7264 1 +#define CONFIG_DISPLAY_BOARDINFO + #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC3,115200" #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } diff --git a/include/configs/rsk7269.h b/include/configs/rsk7269.h index ec7a99b..f470954 100644 --- a/include/configs/rsk7269.h +++ b/include/configs/rsk7269.h @@ -13,6 +13,8 @@ #define CONFIG_CPU_SH7269 1 #define CONFIG_RSK7269 1 +#define CONFIG_DISPLAY_BOARDINFO + #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC7,115200" #define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE } diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 4f99856..67ca4a6 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -24,6 +24,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index e2ef2d5..d77b470 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -24,6 +24,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index a5a9396..efb7ad9 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -24,6 +24,7 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h index 2e45699..6124826 100644 --- a/include/configs/sh7763rdp.h +++ b/include/configs/sh7763rdp.h @@ -23,6 +23,7 @@ #define CONFIG_BOOTARGS "console=ttySC2,115200 root=1f01" #define CONFIG_ENV_OVERWRITE 1 +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* SCIF */ diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 926efbe..a74fd60 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -26,6 +26,7 @@ "bootdevice=0:1\0" \ "usbload=usb reset;usbboot;usb stop;bootm\0" +#define CONFIG_DISPLAY_BOARDINFO #undef CONFIG_SHOW_BOOT_PROGRESS /* MEMORY */ diff --git a/include/configs/shmin.h b/include/configs/shmin.h index e0fc3a2..dde6625 100644 --- a/include/configs/shmin.h +++ b/include/configs/shmin.h @@ -26,6 +26,7 @@ * you should set undef. */ #undef CONFIG_SHOW_BOOT_PROGRESS +#define CONFIG_DISPLAY_BOARDINFO /* system */ #define SHMIN_SDRAM_BASE (0x8C000000)
All SH boards define a checkboard() function which outputs basic board information on boot, however generic board support requires to define CONFIG_DISPLAY_BOARDINFO to do that, so define it for the boards. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> --- include/configs/MigoR.h | 1 + include/configs/ap325rxa.h | 1 + include/configs/ap_sh4a_4a.h | 1 + include/configs/ecovec.h | 1 + include/configs/espt.h | 1 + include/configs/mpr2.h | 2 ++ include/configs/ms7720se.h | 1 + include/configs/ms7722se.h | 1 + include/configs/ms7750se.h | 2 ++ include/configs/r0p7734.h | 1 + include/configs/r2dplus.h | 2 ++ include/configs/r7780mp.h | 2 ++ include/configs/rsk7203.h | 1 + include/configs/rsk7264.h | 2 ++ include/configs/rsk7269.h | 2 ++ include/configs/sh7752evb.h | 1 + include/configs/sh7753evb.h | 1 + include/configs/sh7757lcr.h | 1 + include/configs/sh7763rdp.h | 1 + include/configs/sh7785lcr.h | 1 + include/configs/shmin.h | 1 + 21 files changed, 27 insertions(+)