| Message ID | 20200906223735.21290-1-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | dc8368b7ee2b06c3b151074e4eb11fe3dbaa41d8 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [v2] configs: powerpc: Don't set CONFIG_ENV_ADDR for QorIQ SPIFLASH | expand |
Hi Tom, On Mon, Sep 7, 2020 at 10:37 AM Chris Packham <judge.packham@gmail.com> wrote: > > Setting CONFIG_ENV_ADDR to something other than 0 stops gd->env_addr > from being allocated dynamically. When the environment is in SPI we need > it to be allocated as we can't use a direct memory mapped address. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > --- Is this in your queue? I just saw the v2020.10-rc5 announcement and noted this hasn't been picked up yet. > > Changes in v2: > - Update the other SPIFLASH_defconfigs > > configs/T1023RDB_SPIFLASH_defconfig | 1 - > configs/T1024RDB_SPIFLASH_defconfig | 1 - > configs/T1040D4RDB_SPIFLASH_defconfig | 1 - > configs/T1040RDB_SPIFLASH_defconfig | 1 - > configs/T1042D4RDB_SPIFLASH_defconfig | 1 - > configs/T1042RDB_PI_SPIFLASH_defconfig | 1 - > configs/T2080QDS_SPIFLASH_defconfig | 1 - > configs/T2080RDB_SPIFLASH_defconfig | 1 - > configs/T2081QDS_SPIFLASH_defconfig | 1 - > 9 files changed, 9 deletions(-) > > diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig > index b33bf44c1198..0b16784b616b 100644 > --- a/configs/T1023RDB_SPIFLASH_defconfig > +++ b/configs/T1023RDB_SPIFLASH_defconfig > @@ -50,7 +50,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 > CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:1m(uboot),5m(kernel),128k(dtb),-(user)" > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_FSL_CAAM=y > CONFIG_FSL_ESDHC=y > CONFIG_MTD=y > diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig > index 31cbc7a95591..784d125bceb6 100644 > --- a/configs/T1024RDB_SPIFLASH_defconfig > +++ b/configs/T1024RDB_SPIFLASH_defconfig > @@ -53,7 +53,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 > CONFIG_OF_CONTROL=y > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_DM=y > CONFIG_FSL_CAAM=y > CONFIG_SYS_FSL_DDR3=y > diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig > index 04578bf7c19c..ed3a7bfa1d8a 100644 > --- a/configs/T1040D4RDB_SPIFLASH_defconfig > +++ b/configs/T1040D4RDB_SPIFLASH_defconfig > @@ -47,7 +47,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 > CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)" > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_FSL_CAAM=y > CONFIG_FSL_ESDHC=y > CONFIG_MTD=y > diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig > index 4b674d5955a2..f162019ab3e7 100644 > --- a/configs/T1040RDB_SPIFLASH_defconfig > +++ b/configs/T1040RDB_SPIFLASH_defconfig > @@ -47,7 +47,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 > CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)" > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_FSL_CAAM=y > CONFIG_SYS_FSL_DDR3=y > CONFIG_FSL_ESDHC=y > diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig > index e670f068e698..fae57883a474 100644 > --- a/configs/T1042D4RDB_SPIFLASH_defconfig > +++ b/configs/T1042D4RDB_SPIFLASH_defconfig > @@ -50,7 +50,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 > CONFIG_OF_CONTROL=y > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_DM=y > CONFIG_FSL_CAAM=y > CONFIG_DM_I2C=y > diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig > index afeb65aa4732..3b4e2a4fbfdd 100644 > --- a/configs/T1042RDB_PI_SPIFLASH_defconfig > +++ b/configs/T1042RDB_PI_SPIFLASH_defconfig > @@ -49,7 +49,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 > CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)" > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_FSL_CAAM=y > CONFIG_SYS_FSL_DDR3=y > CONFIG_FSL_ESDHC=y > diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig > index 0e787ea440af..cd5e445db14c 100644 > --- a/configs/T2080QDS_SPIFLASH_defconfig > +++ b/configs/T2080QDS_SPIFLASH_defconfig > @@ -46,7 +46,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 > CONFIG_OF_CONTROL=y > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_DM=y > CONFIG_FSL_CAAM=y > CONFIG_DM_I2C=y > diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig > index 62cbab1f0734..ba4ac1010502 100644 > --- a/configs/T2080RDB_SPIFLASH_defconfig > +++ b/configs/T2080RDB_SPIFLASH_defconfig > @@ -50,7 +50,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 > CONFIG_OF_CONTROL=y > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_DM=y > CONFIG_FSL_CAAM=y > CONFIG_DM_I2C=y > diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig > index 5a273c54f858..903281d767bd 100644 > --- a/configs/T2081QDS_SPIFLASH_defconfig > +++ b/configs/T2081QDS_SPIFLASH_defconfig > @@ -44,7 +44,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 > CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:1m(uboot),5m(kernel),128k(dtb),-(user)" > CONFIG_ENV_OVERWRITE=y > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_ENV_ADDR=0xFFFC9000 > CONFIG_FSL_CAAM=y > CONFIG_FSL_ESDHC=y > CONFIG_MTD=y > -- > 2.28.0 >
On Tue, Sep 22, 2020 at 09:12:26AM +1200, Chris Packham wrote: > Hi Tom, > > On Mon, Sep 7, 2020 at 10:37 AM Chris Packham <judge.packham@gmail.com> wrote: > > > > Setting CONFIG_ENV_ADDR to something other than 0 stops gd->env_addr > > from being allocated dynamically. When the environment is in SPI we need > > it to be allocated as we can't use a direct memory mapped address. > > > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > > --- > > Is this in your queue? I just saw the v2020.10-rc5 announcement and > noted this hasn't been picked up yet. Thanks for the reminder, I will take this, yes.
On Mon, Sep 07, 2020 at 10:37:35AM +1200, Chris Packham wrote: > Setting CONFIG_ENV_ADDR to something other than 0 stops gd->env_addr > from being allocated dynamically. When the environment is in SPI we need > it to be allocated as we can't use a direct memory mapped address. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Applied to u-boot/master, thanks!
diff --git a/configs/T1023RDB_SPIFLASH_defconfig b/configs/T1023RDB_SPIFLASH_defconfig index b33bf44c1198..0b16784b616b 100644 --- a/configs/T1023RDB_SPIFLASH_defconfig +++ b/configs/T1023RDB_SPIFLASH_defconfig @@ -50,7 +50,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:1m(uboot),5m(kernel),128k(dtb),-(user)" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y diff --git a/configs/T1024RDB_SPIFLASH_defconfig b/configs/T1024RDB_SPIFLASH_defconfig index 31cbc7a95591..784d125bceb6 100644 --- a/configs/T1024RDB_SPIFLASH_defconfig +++ b/configs/T1024RDB_SPIFLASH_defconfig @@ -53,7 +53,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig index 04578bf7c19c..ed3a7bfa1d8a 100644 --- a/configs/T1040D4RDB_SPIFLASH_defconfig +++ b/configs/T1040D4RDB_SPIFLASH_defconfig @@ -47,7 +47,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y diff --git a/configs/T1040RDB_SPIFLASH_defconfig b/configs/T1040RDB_SPIFLASH_defconfig index 4b674d5955a2..f162019ab3e7 100644 --- a/configs/T1040RDB_SPIFLASH_defconfig +++ b/configs/T1040RDB_SPIFLASH_defconfig @@ -47,7 +47,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig index e670f068e698..fae57883a474 100644 --- a/configs/T1042D4RDB_SPIFLASH_defconfig +++ b/configs/T1042D4RDB_SPIFLASH_defconfig @@ -50,7 +50,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y diff --git a/configs/T1042RDB_PI_SPIFLASH_defconfig b/configs/T1042RDB_PI_SPIFLASH_defconfig index afeb65aa4732..3b4e2a4fbfdd 100644 --- a/configs/T1042RDB_PI_SPIFLASH_defconfig +++ b/configs/T1042RDB_PI_SPIFLASH_defconfig @@ -49,7 +49,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:2m(uboot),9m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:2m(uboot),9m(kernel),128k(dtb),-(user)" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_FSL_ESDHC=y diff --git a/configs/T2080QDS_SPIFLASH_defconfig b/configs/T2080QDS_SPIFLASH_defconfig index 0e787ea440af..cd5e445db14c 100644 --- a/configs/T2080QDS_SPIFLASH_defconfig +++ b/configs/T2080QDS_SPIFLASH_defconfig @@ -46,7 +46,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y diff --git a/configs/T2080RDB_SPIFLASH_defconfig b/configs/T2080RDB_SPIFLASH_defconfig index 62cbab1f0734..ba4ac1010502 100644 --- a/configs/T2080RDB_SPIFLASH_defconfig +++ b/configs/T2080RDB_SPIFLASH_defconfig @@ -50,7 +50,6 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),9 CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_DM=y CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y diff --git a/configs/T2081QDS_SPIFLASH_defconfig b/configs/T2081QDS_SPIFLASH_defconfig index 5a273c54f858..903281d767bd 100644 --- a/configs/T2081QDS_SPIFLASH_defconfig +++ b/configs/T2081QDS_SPIFLASH_defconfig @@ -44,7 +44,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=fe8000000.nor,nand0=fff800000.flash,spi0=spife110000 CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);fff800000.flash:1m(uboot),5m(kernel),128k(dtb),96m(fs),-(user);spife110000.0:1m(uboot),5m(kernel),128k(dtb),-(user)" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y -CONFIG_ENV_ADDR=0xFFFC9000 CONFIG_FSL_CAAM=y CONFIG_FSL_ESDHC=y CONFIG_MTD=y
Setting CONFIG_ENV_ADDR to something other than 0 stops gd->env_addr from being allocated dynamically. When the environment is in SPI we need it to be allocated as we can't use a direct memory mapped address. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- Changes in v2: - Update the other SPIFLASH_defconfigs configs/T1023RDB_SPIFLASH_defconfig | 1 - configs/T1024RDB_SPIFLASH_defconfig | 1 - configs/T1040D4RDB_SPIFLASH_defconfig | 1 - configs/T1040RDB_SPIFLASH_defconfig | 1 - configs/T1042D4RDB_SPIFLASH_defconfig | 1 - configs/T1042RDB_PI_SPIFLASH_defconfig | 1 - configs/T2080QDS_SPIFLASH_defconfig | 1 - configs/T2080RDB_SPIFLASH_defconfig | 1 - configs/T2081QDS_SPIFLASH_defconfig | 1 - 9 files changed, 9 deletions(-)