[source] uboot-lantiq: fix boot of images larger than 8MB

LEDE Commits lede-commits at lists.infradead.org
Mon Jan 2 12:37:48 PST 2017


mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/8c822ec4ca7557563370aa568c034edda81e6b6e

commit 8c822ec4ca7557563370aa568c034edda81e6b6e
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Fri Dec 30 21:42:05 2016 +0100

    uboot-lantiq: fix boot of images larger than 8MB
    
    Increasing CONFIG_SYS_BOOTM_LEN from 8 MB to 16 MB is necessary to
    support uncompressing images larger than 8 MB when using the bootm
    command.
    
    Signed-off-by: Mathias Kresin <dev at kresin.me>
---
 .../patches/0102-MIPS-add-board-support-for-Arcadyan-ARV4519PW.patch  | 4 +++-
 .../patches/0103-MIPS-add-board-support-for-Arcadyan-ARV7518PW.patch  | 4 +++-
 .../patches/0104-MIPS-add-board-support-for-AudioCodes-MP-252.patch   | 4 +++-
 .../patches/0105-MIPS-add-board-support-for-AVM-FritzBox-3370.patch   | 4 +++-
 .../patches/0106-MIPS-add-board-support-for-Gigaset-SX76X.patch       | 4 +++-
 .../patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch  | 4 +++-
 .../patches/0108-MIPS-add-board-support-for-Arcadyan-ARV752DPW.patch  | 4 +++-
 .../0109-MIPS-add-board-support-for-Arcadyan-ARV752DPW22.patch        | 4 +++-
 .../patches/0110-MIPS-add-board-support-for-Arcadyan-ARV7510PW.patch  | 4 +++-
 .../0111-MIPS-add-board-support-for-Arcadyan-ARV7510PW22.patch        | 4 +++-
 .../0113-MIPS-add-board-support-for-Arcadyan-ARV8539PW22.patch        | 4 +++-
 .../0115-MIPS-add-board-support-for-Arcadyan-ARV7506PW11.patch        | 4 +++-
 12 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/package/boot/uboot-lantiq/patches/0102-MIPS-add-board-support-for-Arcadyan-ARV4519PW.patch b/package/boot/uboot-lantiq/patches/0102-MIPS-add-board-support-for-Arcadyan-ARV4519PW.patch
index 51738e4..413061c 100644
--- a/package/boot/uboot-lantiq/patches/0102-MIPS-add-board-support-for-Arcadyan-ARV4519PW.patch
+++ b/package/boot/uboot-lantiq/patches/0102-MIPS-add-board-support-for-Arcadyan-ARV4519PW.patch
@@ -172,7 +172,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  Active  mips        mips32         danube      lantiq          easy50712           easy50712_ram                        easy50712:SYS_BOOT_RAM                                                                                                            Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 --- /dev/null
 +++ b/include/configs/arv4519pw.h
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,69 @@
 +/*
 + * Copyright (C) 2012-2013 Luka Perkov <luka at openwrt.org>
 + *
@@ -193,6 +193,8 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_AR8216
diff --git a/package/boot/uboot-lantiq/patches/0103-MIPS-add-board-support-for-Arcadyan-ARV7518PW.patch b/package/boot/uboot-lantiq/patches/0103-MIPS-add-board-support-for-Arcadyan-ARV7518PW.patch
index 21e6a2c..490ab2d 100644
--- a/package/boot/uboot-lantiq/patches/0103-MIPS-add-board-support-for-Arcadyan-ARV7518PW.patch
+++ b/package/boot/uboot-lantiq/patches/0103-MIPS-add-board-support-for-Arcadyan-ARV7518PW.patch
@@ -172,7 +172,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  Active  mips        mips32         danube      lantiq          easy50712           easy50712_ram                        easy50712:SYS_BOOT_RAM                                                                                                            Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 --- /dev/null
 +++ b/include/configs/arv7518pw.h
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,69 @@
 +/*
 + * Copyright (C) 2012-2013 Luka Perkov <luka at openwrt.org>
 + *
@@ -193,6 +193,8 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_AR8216
diff --git a/package/boot/uboot-lantiq/patches/0104-MIPS-add-board-support-for-AudioCodes-MP-252.patch b/package/boot/uboot-lantiq/patches/0104-MIPS-add-board-support-for-AudioCodes-MP-252.patch
index 00820f8..16a44cc 100644
--- a/package/boot/uboot-lantiq/patches/0104-MIPS-add-board-support-for-AudioCodes-MP-252.patch
+++ b/package/boot/uboot-lantiq/patches/0104-MIPS-add-board-support-for-AudioCodes-MP-252.patch
@@ -185,7 +185,7 @@ Signed-off-by: Daniel Golle <dgolle at allnet.de>
  Active  mips        mips32         danube      lantiq          easy50712           easy50712_ram                        easy50712:SYS_BOOT_RAM                                                                                                            Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 --- /dev/null
 +++ b/include/configs/acmp252.h
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,62 @@
 +/*
 + * Copyright (C) 2013 Daniel Golle <daniel.golle at gmail.com>
 + * Copyright (C) 2011 Luka Perkov <luka at openwrt.org>
@@ -207,6 +207,8 @@ Signed-off-by: Daniel Golle <dgolle at allnet.de>
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_ADM6996I
diff --git a/package/boot/uboot-lantiq/patches/0105-MIPS-add-board-support-for-AVM-FritzBox-3370.patch b/package/boot/uboot-lantiq/patches/0105-MIPS-add-board-support-for-AVM-FritzBox-3370.patch
index 77014e4..d7850e4 100644
--- a/package/boot/uboot-lantiq/patches/0105-MIPS-add-board-support-for-AVM-FritzBox-3370.patch
+++ b/package/boot/uboot-lantiq/patches/0105-MIPS-add-board-support-for-AVM-FritzBox-3370.patch
@@ -273,7 +273,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  Active  mips        mips32         vrx200      lantiq          easy80920           easy80920_norspl                     easy80920:SYS_BOOT_NORSPL                                                                                                         Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 --- /dev/null
 +++ b/include/configs/fb3370.h
-@@ -0,0 +1,78 @@
+@@ -0,0 +1,80 @@
 +/*
 + * Copyright (C) 2011-2013 Daniel Schwierzeck, daniel.schwierzeck at googlemail.com
 + *
@@ -308,6 +308,8 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +
 +#define CONFIG_SYS_DRAM_PROBE
 +
++#define CONFIG_SYS_BOOTM_LEN          0x1000000       /* 16 MB */
++
 +/* Environment */
 +#define CONFIG_ENV_SPI_BUS		CONFIG_SPL_SPI_BUS
 +#define CONFIG_ENV_SPI_CS		CONFIG_SPL_SPI_CS
diff --git a/package/boot/uboot-lantiq/patches/0106-MIPS-add-board-support-for-Gigaset-SX76X.patch b/package/boot/uboot-lantiq/patches/0106-MIPS-add-board-support-for-Gigaset-SX76X.patch
index 96737fa..16946e9 100644
--- a/package/boot/uboot-lantiq/patches/0106-MIPS-add-board-support-for-Gigaset-SX76X.patch
+++ b/package/boot/uboot-lantiq/patches/0106-MIPS-add-board-support-for-Gigaset-SX76X.patch
@@ -185,7 +185,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  Active  mips        mips32         danube      lantiq          easy50712           easy50712_ram                        easy50712:SYS_BOOT_RAM                                                                                                            Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 --- /dev/null
 +++ b/include/configs/sx76x.h
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,61 @@
 +/*
 + * Copyright (C) 2011-2013 Luka Perkov <luka at openwrt.org>
 + *
@@ -206,6 +206,8 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_ADM6996I
diff --git a/package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch b/package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch
index a1c0bde..3f77d98 100644
--- a/package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch
+++ b/package/boot/uboot-lantiq/patches/0107-MIPS-add-board-support-for-ZyXEL-P-2812HNU-Fx.patch
@@ -231,7 +231,7 @@ Signed-off-by: Luka Perkov <luka at openwrt.org>
  Active  nds32       n1213          ag101       AndesTech       adp-ag101           adp-ag101                            -                                                                                                                                 Andes <uboot at andestech.com>
 --- /dev/null
 +++ b/include/configs/p2812hnufx.h
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,69 @@
 +/*
 + * Copyright (C) 2013 Luka Perkov <luka at openwrt.org>
 + *
@@ -265,6 +265,8 @@ Signed-off-by: Luka Perkov <luka at openwrt.org>
 +
 +#define CONFIG_SYS_DRAM_PROBE
 +
++#define CONFIG_SYS_BOOTM_LEN          0x1000000       /* 16 MB */
++
 +/* Environment */
 +#if defined(CONFIG_SYS_BOOT_NANDSPL)
 +#define CONFIG_ENV_IS_IN_NAND
diff --git a/package/boot/uboot-lantiq/patches/0108-MIPS-add-board-support-for-Arcadyan-ARV752DPW.patch b/package/boot/uboot-lantiq/patches/0108-MIPS-add-board-support-for-Arcadyan-ARV752DPW.patch
index 07bef6e..0849305 100644
--- a/package/boot/uboot-lantiq/patches/0108-MIPS-add-board-support-for-Arcadyan-ARV752DPW.patch
+++ b/package/boot/uboot-lantiq/patches/0108-MIPS-add-board-support-for-Arcadyan-ARV752DPW.patch
@@ -172,7 +172,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  Active  mips        mips32         danube      gigaset         sx76x               gigasx76x_nor                        sx76x:SYS_BOOT_NOR                                                                                                                Luka Perkov <luka at openwrt.org>
 --- /dev/null
 +++ b/include/configs/arv752dpw.h
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,69 @@
 +/*
 + * Copyright (C) 2012-2013 Luka Perkov <luka at openwrt.org>
 + *
@@ -193,6 +193,8 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_RTL8306
diff --git a/package/boot/uboot-lantiq/patches/0109-MIPS-add-board-support-for-Arcadyan-ARV752DPW22.patch b/package/boot/uboot-lantiq/patches/0109-MIPS-add-board-support-for-Arcadyan-ARV752DPW22.patch
index 85e3ebd..29b9648 100644
--- a/package/boot/uboot-lantiq/patches/0109-MIPS-add-board-support-for-Arcadyan-ARV752DPW22.patch
+++ b/package/boot/uboot-lantiq/patches/0109-MIPS-add-board-support-for-Arcadyan-ARV752DPW22.patch
@@ -173,7 +173,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  Active  mips        mips32         danube      gigaset         sx76x               gigasx76x_nor                        sx76x:SYS_BOOT_NOR                                                                                                                Luka Perkov <luka at openwrt.org>
 --- /dev/null
 +++ b/include/configs/arv752dpw22.h
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,70 @@
 +/*
 + * Copyright (C) 2012-2013 Luka Perkov <luka at openwrt.org>
 + *
@@ -194,6 +194,8 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_AR8216
diff --git a/package/boot/uboot-lantiq/patches/0110-MIPS-add-board-support-for-Arcadyan-ARV7510PW.patch b/package/boot/uboot-lantiq/patches/0110-MIPS-add-board-support-for-Arcadyan-ARV7510PW.patch
index 8c46368..902f7b7 100644
--- a/package/boot/uboot-lantiq/patches/0110-MIPS-add-board-support-for-Arcadyan-ARV7510PW.patch
+++ b/package/boot/uboot-lantiq/patches/0110-MIPS-add-board-support-for-Arcadyan-ARV7510PW.patch
@@ -191,7 +191,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
  Active  mips        mips32         danube      arcadyan        arv7518pw           arv7518pw_ram                        arv7518pw:SYS_BOOT_RAM                                                                                                            Luka Perkov <luka at openwrt.org>
 --- /dev/null
 +++ b/include/configs/arv7510pw.h
-@@ -0,0 +1,75 @@
+@@ -0,0 +1,77 @@
 +/*
 + * Copyright (C) 2013 Matti Laakso <malaakso at elisanet.fi>
 + *
@@ -210,6 +210,8 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
 +#define CONFIG_LTQ_SUPPORT_ETHERNET	/* Enable ethernet */
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_ADM6996I
diff --git a/package/boot/uboot-lantiq/patches/0111-MIPS-add-board-support-for-Arcadyan-ARV7510PW22.patch b/package/boot/uboot-lantiq/patches/0111-MIPS-add-board-support-for-Arcadyan-ARV7510PW22.patch
index 902a7cf..416f16e 100644
--- a/package/boot/uboot-lantiq/patches/0111-MIPS-add-board-support-for-Arcadyan-ARV7510PW22.patch
+++ b/package/boot/uboot-lantiq/patches/0111-MIPS-add-board-support-for-Arcadyan-ARV7510PW22.patch
@@ -168,7 +168,7 @@
  Active  mips        mips32         danube      arcadyan        arv7518pw           arv7518pw_ram                        arv7518pw:SYS_BOOT_RAM                                                                                                            Luka Perkov <luka at openwrt.org>
 --- /dev/null
 +++ b/include/configs/arv7510pw22.h
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,69 @@
 +/*
 + * Copyright (C) 2014 Álvaro Fernández Rojas <noltari at gmail.com>
 + *
@@ -189,6 +189,8 @@
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_AR8216
diff --git a/package/boot/uboot-lantiq/patches/0113-MIPS-add-board-support-for-Arcadyan-ARV8539PW22.patch b/package/boot/uboot-lantiq/patches/0113-MIPS-add-board-support-for-Arcadyan-ARV8539PW22.patch
index e68ce2d..5185c94 100644
--- a/package/boot/uboot-lantiq/patches/0113-MIPS-add-board-support-for-Arcadyan-ARV8539PW22.patch
+++ b/package/boot/uboot-lantiq/patches/0113-MIPS-add-board-support-for-Arcadyan-ARV8539PW22.patch
@@ -168,7 +168,7 @@
  Active  mips        mips32         danube      gigaset         sx76x               gigasx76x_nor                        sx76x:SYS_BOOT_NOR                                                                                                                Luka Perkov <luka at openwrt.org>
 --- /dev/null
 +++ b/include/configs/arv8539pw22.h
-@@ -0,0 +1,68 @@
+@@ -0,0 +1,70 @@
 +/*
 + * Copyright (C) 2012-2013 Luka Perkov <luka at openwrt.org>
 + *
@@ -189,6 +189,8 @@
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH   /* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_AR8216
diff --git a/package/boot/uboot-lantiq/patches/0115-MIPS-add-board-support-for-Arcadyan-ARV7506PW11.patch b/package/boot/uboot-lantiq/patches/0115-MIPS-add-board-support-for-Arcadyan-ARV7506PW11.patch
index b7a8a6a..2a7c49c 100644
--- a/package/boot/uboot-lantiq/patches/0115-MIPS-add-board-support-for-Arcadyan-ARV7506PW11.patch
+++ b/package/boot/uboot-lantiq/patches/0115-MIPS-add-board-support-for-Arcadyan-ARV7506PW11.patch
@@ -210,7 +210,7 @@
  Active  mips        mips32         danube      arcadyan        arv7510pw           arv7510pw_ram                        arv7510pw:SYS_BOOT_RAM                                                                                                            Luka Perkov <luka at openwrt.org>
 --- /dev/null
 +++ b/include/configs/arv7506pw11.h
-@@ -0,0 +1,62 @@
+@@ -0,0 +1,64 @@
 +/*
 + * Copyright (C) 2016 Mathias Kresin <dev at kresin.me>
 + *
@@ -231,6 +231,8 @@
 +
 +#define CONFIG_LTQ_SUPPORT_NOR_FLASH	/* Have a parallel NOR flash */
 +
++#define CONFIG_SYS_BOOTM_LEN		0x1000000	/* 16 MB */
++
 +/* Switch devices */
 +#define CONFIG_SWITCH_MULTI
 +#define CONFIG_SWITCH_RTL8306



More information about the lede-commits mailing list