Message ID | 20190925145750.200592-45-sjg@chromium.org |
---|---|
State | Accepted |
Commit | b51882d0079d3275bdb83ce49fdc8a90133f7f07 |
Delegated to: | Bin Meng |
Headers | show |
Series | x86: Add initial support for apollolake | expand |
You've got the config name wrong in the summary (forgot '_SIZE' in the middle). On Wed, Sep 25, 2019 at 5:24 PM Simon Glass <sjg@chromium.org> wrote: > > This is currently a decimal value which is not as convenient or > meaningful. Also U-Boot tends to use hex everywhere. > > Convert this option to hex and add a comment for the size_check macro. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Makefile | 10 +++++++--- > arch/arm/mach-socfpga/Kconfig | 2 +- I would have expected to be on CC for this file? Otherwise: Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Regards, Simon > common/spl/Kconfig | 2 +- > configs/evb-rk3288_defconfig | 2 +- > configs/tinker-rk3288_defconfig | 2 +- > 5 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/Makefile b/Makefile > index fd390e19458..a7a48b6aef3 100644 > --- a/Makefile > +++ b/Makefile > @@ -337,14 +337,18 @@ endif > # KBUILD_MODULES := 1 > #endif > > +# Check ths size of a binary: > +# Args: > +# $1: File to check > +# #2: Size limit in bytes (decimal or 0xhex) > define size_check > actual=$$( wc -c $1 | awk '{print $$1}'); \ > limit=$$( printf "%d" $2 ); \ > if test $$actual -gt $$limit; then \ > echo "$1 exceeds file size limit:" >&2; \ > - echo " limit: $$limit bytes" >&2; \ > - echo " actual: $$actual bytes" >&2; \ > - echo " excess: $$((actual - limit)) bytes" >&2; \ > + echo " limit: $$(printf %#x bytes $$limit) bytes" >&2; \ > + echo " actual: $$(printf %#x $$actual) bytes" >&2; \ > + echo " excess: $$(printf %#x $$((actual - limit))) bytes" >&2;\ > exit 1; \ > fi > endef > diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig > index ee79953fcc2..45de153aa5a 100644 > --- a/arch/arm/mach-socfpga/Kconfig > +++ b/arch/arm/mach-socfpga/Kconfig > @@ -4,7 +4,7 @@ config NR_DRAM_BANKS > default 1 > > config SPL_SIZE_LIMIT > - default 65536 if TARGET_SOCFPGA_GEN5 > + default 0x10000 if TARGET_SOCFPGA_GEN5 > > config SPL_SIZE_LIMIT_PROVIDE_STACK > default 0x200 if TARGET_SOCFPGA_GEN5 > diff --git a/common/spl/Kconfig b/common/spl/Kconfig > index 048b85ba7a2..ef4fb19e52c 100644 > --- a/common/spl/Kconfig > +++ b/common/spl/Kconfig > @@ -26,7 +26,7 @@ config SPL_FRAMEWORK > and the Linux Kernel. If unsure, say Y. > > config SPL_SIZE_LIMIT > - int "Maximum size of SPL image" > + hex "Maximum size of SPL image" > depends on SPL > default 69632 if ARCH_MX6 > default 0 > diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig > index 7b0e908f715..043ee32bb44 100644 > --- a/configs/evb-rk3288_defconfig > +++ b/configs/evb-rk3288_defconfig > @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x01000000 > CONFIG_ROCKCHIP_RK3288=y > CONFIG_TARGET_EVB_RK3288=y > CONFIG_NR_DRAM_BANKS=1 > -CONFIG_SPL_SIZE_LIMIT=307200 > +CONFIG_SPL_SIZE_LIMIT=0x4b000 > CONFIG_SPL_STACK_R_ADDR=0x80000 > CONFIG_DEBUG_UART_BASE=0xff690000 > CONFIG_DEBUG_UART_CLOCK=24000000 > diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig > index 93286084525..eff3b06b5ce 100644 > --- a/configs/tinker-rk3288_defconfig > +++ b/configs/tinker-rk3288_defconfig > @@ -5,7 +5,7 @@ CONFIG_SPL_GPIO_SUPPORT=y > CONFIG_ROCKCHIP_RK3288=y > CONFIG_TARGET_TINKER_RK3288=y > CONFIG_NR_DRAM_BANKS=1 > -CONFIG_SPL_SIZE_LIMIT=307200 > +CONFIG_SPL_SIZE_LIMIT=0x4b000 > CONFIG_SPL_STACK_R_ADDR=0x80000 > CONFIG_DEBUG_UART_BASE=0xff690000 > CONFIG_DEBUG_UART_CLOCK=24000000 > -- > 2.23.0.444.g18eeb5a265-goog > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
On Wed, Sep 25, 2019 at 10:58 PM Simon Glass <sjg@chromium.org> wrote: > > This is currently a decimal value which is not as convenient or > meaningful. Also U-Boot tends to use hex everywhere. > > Convert this option to hex and add a comment for the size_check macro. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Makefile | 10 +++++++--- > arch/arm/mach-socfpga/Kconfig | 2 +- > common/spl/Kconfig | 2 +- > configs/evb-rk3288_defconfig | 2 +- > configs/tinker-rk3288_defconfig | 2 +- > 5 files changed, 11 insertions(+), 7 deletions(-) > Acked-by: Bin Meng <bmeng.cn@gmail.com> I can fix the commit summary issue (missing _SIZE, as pointed out by Simon Goldschmidt) when applying.
On Sat, Oct 5, 2019 at 11:18 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Wed, Sep 25, 2019 at 10:58 PM Simon Glass <sjg@chromium.org> wrote: > > > > This is currently a decimal value which is not as convenient or > > meaningful. Also U-Boot tends to use hex everywhere. > > > > Convert this option to hex and add a comment for the size_check macro. > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > --- > > > > Makefile | 10 +++++++--- > > arch/arm/mach-socfpga/Kconfig | 2 +- > > common/spl/Kconfig | 2 +- > > configs/evb-rk3288_defconfig | 2 +- > > configs/tinker-rk3288_defconfig | 2 +- > > 5 files changed, 11 insertions(+), 7 deletions(-) > > > > Acked-by: Bin Meng <bmeng.cn@gmail.com> > > I can fix the commit summary issue (missing _SIZE, as pointed out by > Simon Goldschmidt) when applying. Fixed the typo in the commit title, and applied to u-boot-x86/next, thanks!
diff --git a/Makefile b/Makefile index fd390e19458..a7a48b6aef3 100644 --- a/Makefile +++ b/Makefile @@ -337,14 +337,18 @@ endif # KBUILD_MODULES := 1 #endif +# Check ths size of a binary: +# Args: +# $1: File to check +# #2: Size limit in bytes (decimal or 0xhex) define size_check actual=$$( wc -c $1 | awk '{print $$1}'); \ limit=$$( printf "%d" $2 ); \ if test $$actual -gt $$limit; then \ echo "$1 exceeds file size limit:" >&2; \ - echo " limit: $$limit bytes" >&2; \ - echo " actual: $$actual bytes" >&2; \ - echo " excess: $$((actual - limit)) bytes" >&2; \ + echo " limit: $$(printf %#x bytes $$limit) bytes" >&2; \ + echo " actual: $$(printf %#x $$actual) bytes" >&2; \ + echo " excess: $$(printf %#x $$((actual - limit))) bytes" >&2;\ exit 1; \ fi endef diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index ee79953fcc2..45de153aa5a 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -4,7 +4,7 @@ config NR_DRAM_BANKS default 1 config SPL_SIZE_LIMIT - default 65536 if TARGET_SOCFPGA_GEN5 + default 0x10000 if TARGET_SOCFPGA_GEN5 config SPL_SIZE_LIMIT_PROVIDE_STACK default 0x200 if TARGET_SOCFPGA_GEN5 diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 048b85ba7a2..ef4fb19e52c 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -26,7 +26,7 @@ config SPL_FRAMEWORK and the Linux Kernel. If unsure, say Y. config SPL_SIZE_LIMIT - int "Maximum size of SPL image" + hex "Maximum size of SPL image" depends on SPL default 69632 if ARCH_MX6 default 0 diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig index 7b0e908f715..043ee32bb44 100644 --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x01000000 CONFIG_ROCKCHIP_RK3288=y CONFIG_TARGET_EVB_RK3288=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_SPL_SIZE_LIMIT=307200 +CONFIG_SPL_SIZE_LIMIT=0x4b000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART_BASE=0xff690000 CONFIG_DEBUG_UART_CLOCK=24000000 diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig index 93286084525..eff3b06b5ce 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@ -5,7 +5,7 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_ROCKCHIP_RK3288=y CONFIG_TARGET_TINKER_RK3288=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_SPL_SIZE_LIMIT=307200 +CONFIG_SPL_SIZE_LIMIT=0x4b000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEBUG_UART_BASE=0xff690000 CONFIG_DEBUG_UART_CLOCK=24000000
This is currently a decimal value which is not as convenient or meaningful. Also U-Boot tends to use hex everywhere. Convert this option to hex and add a comment for the size_check macro. Signed-off-by: Simon Glass <sjg@chromium.org> --- Makefile | 10 +++++++--- arch/arm/mach-socfpga/Kconfig | 2 +- common/spl/Kconfig | 2 +- configs/evb-rk3288_defconfig | 2 +- configs/tinker-rk3288_defconfig | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-)