| Message ID | 1425227620-6656-1-git-send-email-sjg@chromium.org |
|---|---|
| State | Rejected |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, Mar 01, 2015 at 09:33:27AM -0700, Simon Glass wrote: > This string seems wrong - U-Boot is normally written with a capital B. > > Signed-off-by: Simon Glass <sjg@chromium.org> But it's in the wild and thus in various dhcpd config files such as: ... } elsif substring (option vendor-class-identifier, 0, 17) = "AM335x U-Boot SPL" { filename "am335x/u-boot.img"; ... in mine for am335x. So "U-boot" exists in other peoples file and thus we can't really go off and change it. NAK, sorry.
Hi Tom, On 2 March 2015 at 06:59, Tom Rini <trini@konsulko.com> wrote: > On Sun, Mar 01, 2015 at 09:33:27AM -0700, Simon Glass wrote: > >> This string seems wrong - U-Boot is normally written with a capital B. >> >> Signed-off-by: Simon Glass <sjg@chromium.org> > > But it's in the wild and thus in various dhcpd config files such as: > ... > } elsif substring (option vendor-class-identifier, 0, 17) = "AM335x U-Boot SPL" { > filename "am335x/u-boot.img"; > ... > > in mine for am335x. So "U-boot" exists in other peoples file and thus > we can't really go off and change it. NAK, sorry. OK, I wondered if someone was going to say that. It's a shame it isn't case-insensitive! Regards, Simon
diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 1ecc0bb..faf564f 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -23,9 +23,9 @@ #if defined(__arm__) #define CONFIG_BOOTP_PXE_CLIENTARCH 0x100 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7" #else -#define CONFIG_BOOTP_VCI_STRING "U-boot.arm" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.arm" #endif #endif diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index 6fe032c..69de475 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -27,7 +27,7 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 #define CONFIG_IDENT_STRING " LS2085A-EMU" -#define CONFIG_BOOTP_VCI_STRING "U-boot.LS2085A-EMU" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.LS2085A-EMU" /* Flat Device Tree Definitions */ #define CONFIG_OF_LIBFDT diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 7fb28a5..d4ba4e9 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -38,7 +38,7 @@ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_IDENT_STRING " vexpress_aemv8a" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.vexpress_aemv8a" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv8.vexpress_aemv8a" /* Link Definitions */ #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h index b43afa2..3c9777f 100644 --- a/include/configs/vexpress_ca15_tc2.h +++ b/include/configs/vexpress_ca15_tc2.h @@ -13,7 +13,7 @@ #define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP #include "vexpress_common.h" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca15x2_tc2" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7.vexpress_ca15x2_tc2" #define CONFIG_SYSFLAGS_ADDR 0x1c010030 #define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR diff --git a/include/configs/vexpress_ca5x2.h b/include/configs/vexpress_ca5x2.h index 7719d59..6c160a5 100644 --- a/include/configs/vexpress_ca5x2.h +++ b/include/configs/vexpress_ca5x2.h @@ -13,6 +13,6 @@ #define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP #include "vexpress_common.h" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca5x2" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7.vexpress_ca5x2" #endif /* __VEXPRESS_CA5X2_h */ diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index 38ac4ed..564521e 100644 --- a/include/configs/vexpress_ca9x4.h +++ b/include/configs/vexpress_ca9x4.h @@ -13,6 +13,6 @@ #define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP #include "vexpress_common.h" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca9x4" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7.vexpress_ca9x4" #endif /* VEXPRESS_CA9X4_H */
This string seems wrong - U-Boot is normally written with a capital B. Signed-off-by: Simon Glass <sjg@chromium.org> --- include/config_distro_defaults.h | 4 ++-- include/configs/ls2085a_common.h | 2 +- include/configs/vexpress_aemv8a.h | 2 +- include/configs/vexpress_ca15_tc2.h | 2 +- include/configs/vexpress_ca5x2.h | 2 +- include/configs/vexpress_ca9x4.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)