| Message ID | 1473743943-15003-2-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 14476ddee27aa88798b7e03c1844e20ff9d98a02 |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Sep 12, 2016 at 11:18:19PM -0600, Simon Glass wrote: > Update the defconfig files to match their canonical form, as produced by > 'make safedefconfig'. > > This is the result of running 'tools/moveconfig.py -s' on the tree. > > Signed-off-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 9494860..0849cbb 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_AM43XX=y CONFIG_TI_SECURE_DEVICE=y CONFIG_TARGET_AM43XX_EVM=y -CONFIG_ISW_ENTRY_ADDR=0x403018e0 +CONFIG_ISW_ENTRY_ADDR=0x40302ae0 CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" CONFIG_SPL=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 71f2d50..7cf5cf5 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_GW_VENTANA=y CONFIG_SPL_STACK_R_ADDR=0x18000000 +CONFIG_DM_SERIAL=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y CONFIG_FIT=y diff --git a/configs/tb100_defconfig b/configs/tb100_defconfig index 6dc2242..cd74631 100644 --- a/configs/tb100_defconfig +++ b/configs/tb100_defconfig @@ -1,6 +1,7 @@ CONFIG_ARC=y CONFIG_TARGET_TB100=y CONFIG_SYS_CLK_FREQ=500000000 +CONFIG_DM_SERIAL=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="abilis_tb100" CONFIG_BOOTDELAY=3
Update the defconfig files to match their canonical form, as produced by 'make safedefconfig'. This is the result of running 'tools/moveconfig.py -s' on the tree. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v3: None Changes in v2: None configs/am43xx_hs_evm_defconfig | 2 +- configs/gwventana_defconfig | 1 + configs/tb100_defconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)