| Message ID | 1534913269-4440-1-git-send-email-praneeth@ti.com |
|---|---|
| State | Accepted |
| Commit | 11ed312896c5f5814064c5d45dcb2f53dc121437 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] configs: am57xx: change default board name to beagle_x15 | expand |
On 08/21/2018 11:47 PM, Praneeth Bajjuri wrote: > beagleboard x15 is the first supported platform variant of am57xx > in AOSP (android open source project) now. > > changing board name to stay in consistent with aosp target name. > > Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> > --- > configs/am57xx_evm_defconfig | 2 +- > configs/am57xx_hs_evm_defconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig > index 1572dc80db03..07ab01e921bf 100644 > --- a/configs/am57xx_evm_defconfig > +++ b/configs/am57xx_evm_defconfig > @@ -14,7 +14,7 @@ CONFIG_NR_DRAM_BANKS=2 > CONFIG_SPL_LOAD_FIT=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_USE_BOOTARGS=y > -CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=am57xevmboard" > +CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=beagle_x15board" The issue will now be unless we rename the RC files in our offering for AM57x EVM, then it will not boot correctly. We can/should ideally ship both sets of RC files (they are the same now, but different HW may need different RC files). I propose we do some U-Boot scripting and set this boot variable based on runtime board detection in U-Boot. Right after we set fdt_file, we can also set android_hardware, then we can replace the above with: androidboot.hardware=${android_hardware}" Andrew > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_INFO_QUIET=y > # CONFIG_MISC_INIT_R is not set > diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig > index 895719286dc5..0522c10b01c4 100644 > --- a/configs/am57xx_hs_evm_defconfig > +++ b/configs/am57xx_hs_evm_defconfig > @@ -20,7 +20,7 @@ CONFIG_SPL_LOAD_FIT=y > CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y > CONFIG_OF_BOARD_SETUP=y > CONFIG_USE_BOOTARGS=y > -CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=am57xevmboard" > +CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=beagle_x15board" > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_INFO_QUIET=y > # CONFIG_MISC_INIT_R is not set >
On Tue, Aug 21, 2018 at 11:47:49PM -0500, Praneeth Bajjuri wrote: > beagleboard x15 is the first supported platform variant of am57xx > in AOSP (android open source project) now. > > changing board name to stay in consistent with aosp target name. > > Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> Applied to u-boot/master, thanks!
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 1572dc80db03..07ab01e921bf 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -14,7 +14,7 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=am57xevmboard" +CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=beagle_x15board" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 895719286dc5..0522c10b01c4 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -20,7 +20,7 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=am57xevmboard" +CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=beagle_x15board" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set
beagleboard x15 is the first supported platform variant of am57xx in AOSP (android open source project) now. changing board name to stay in consistent with aosp target name. Signed-off-by: Praneeth Bajjuri <praneeth@ti.com> --- configs/am57xx_evm_defconfig | 2 +- configs/am57xx_hs_evm_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)