| Message ID | 1411400934-7754-14-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
On Mon, Sep 22, 2014 at 09:48:53AM -0600, Simon Glass wrote: > With these options in place it is not possible to change the serial port > using 'make menuconfig' or similar. It seems to result in duplicate > defines. > > For example: > > In file included from include/linux/kconfig.h:4:0, > from <command-line>:0: > include/generated/autoconf.h:20:0: note: this is the location of the previous definition > #define CONFIG_CONS_INDEX 2 > ^ > > The default option seems to be 1 anyway, in board/ti/am335x/Kconfig. > > Remove the options so that we can adjust the serial port if required. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > configs/am335x_boneblack_defconfig | 2 +- > configs/am335x_boneblack_vboot_defconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig > index 38450c0..b631c41 100644 > --- a/configs/am335x_boneblack_defconfig > +++ b/configs/am335x_boneblack_defconfig > @@ -1,4 +1,4 @@ > CONFIG_SPL=y > -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" > +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" > +S:CONFIG_ARM=y > +S:CONFIG_TARGET_AM335X_EVM=y > diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig > index 00317c4..e6c5ee3 100644 > --- a/configs/am335x_boneblack_vboot_defconfig > +++ b/configs/am335x_boneblack_vboot_defconfig > @@ -1,4 +1,4 @@ > CONFIG_SPL=y > -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" > +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT" > +S:CONFIG_ARM=y > +S:CONFIG_TARGET_AM335X_EVM=y Whoops, those should have been deleted when I deleted the rest of them from am335x*. Acked-by: Tom Rini <trini@ti.com>
diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 38450c0..b631c41 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 00317c4..e6c5ee3 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y
With these options in place it is not possible to change the serial port using 'make menuconfig' or similar. It seems to result in duplicate defines. For example: In file included from include/linux/kconfig.h:4:0, from <command-line>:0: include/generated/autoconf.h:20:0: note: this is the location of the previous definition #define CONFIG_CONS_INDEX 2 ^ The default option seems to be 1 anyway, in board/ti/am335x/Kconfig. Remove the options so that we can adjust the serial port if required. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/am335x_boneblack_defconfig | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)