configs: make keystone2 configs start using armv7 common header
v4 cover configs: make keystone2 configs start using armv7 common header
Changes since v3:
- picked up V3 reviewed bys
- Dropped the original 8/8 patch (ramdisk) introduced patch #3 (thumb mode) (dropped patch = https://patchwork.ozlabs.org/patch/497392/ )
Tested on K2HK-evm
OMAP4 Panda: http://pastebin.ubuntu.com/11922876/
AM57xx Beagle-X15: http://pastebin.ubuntu.com/11922884/
OMAP5 uevm: http://pastebin.ubuntu.com/11922947/
AM437x-sk: http://pastebin.ubuntu.com/11922954/
V3: http://marc.info/?l=u-boot&m=143723766211035&w=2
V2: http://marc.info/?l=u-boot&m=143707376106583&w=2
V1: http://marc.info/?l=u-boot&m=143706008602124&w=2
buildman report:
./tools/buildman/buildman -b k2h/config-cleanups-v4 -sSd omap4 omap5 omap3 am33xx keystone boards.cfg is up to date. Nothing to do.
Summary of 9 commits for 74 boards (20 threads, 1 job per thread)
01: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
arm: + am335x_boneblack_vboot
02: configs: split ti_armv7_common into a omap generic header
03: configs: ti: armv7_common: enable Thumb mode for all
arm: (for 74/74 boards) all -43015.7 bss +1.6 text -43017.4
pepper : all -65176 bss -16 text -65160
cairo : all -70032 bss +8 text -70040
cm_t54 : all -72384 bss +36 text -72420
igep0032 : all -72392 text -72392
igep0020 : all -72456 bss +32 text -72488
igep0030 : all -72456 bss +24 text -72480
omap5_uevm : all -74344 bss +4 text -74348
devkit8000 : all -77880 text -77880
beagle_x15 : all -78264 bss -52 text -78212
cm_t335 : all -80400 bss -24 text -80376
pcm051_rev3 : all -81496 bss -8 text -81488
pcm051_rev1 : all -81496 bss -8 text -81488
am335x_igep0033: all -81816 bss +32 text -81848
igep0020_nand : all -82328 bss +32 text -82360
igep0030_nand : all -82392 bss -48 text -82344
omap3_zoom1 : all -82448 text -82448
pengwyn : all -91840 bss +32 text -91872
dra7xx_evm_uart3: all -92168 bss +32 text -92200
dra7xx_evm_qspiboot: all -92168 bss -52 text -92116
dra7xx_evm : all -92232 bss +16 text -92248
am43xx_evm_ethboot: all -92704 bss -16 text -92688
am43xx_evm : all -92736 text -92736
omap3_pandora : all -95360 bss +32 text -95392
birdland_bav335a: all -98200 bss +40 text -98240
birdland_bav335b: all -98200 bss +40 text -98240
omap3_beagle : all -98308 bss -8 text -98300
am335x_boneblack: all -100400 bss +16 text -100416
am43xx_evm_usbhost_boot: all -101496 bss -24 text -101472
am335x_boneblack_vboot: all -102952 bss +24 text -102976
am335x_evm_spiboot: all -103528 bss -24 text -103504
am335x_evm_usbspl: all -115632 bss +48 text -115680
omap3_overo : all -115840 bss -16 text -115824
am335x_evm : all -117104 bss -8 text -117096
am335x_evm_nor : all -123240 bss -32 text -123208
am335x_baltos : all -131296 bss +8 text -131304
04: board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR
05: configs: rename ks2_evm into ti_armv7_keystone2
06: configs: ti_armv7_keystone2: start using armv7_common
arm: (for 74/74 boards) all -53.6 bss -447.1 data +56.5 rodata +90.7 spl/u-boot-spl:all +54.8 spl/u-boot-spl:data +5.4 spl/u-boot-spl:rodata +7.5 spl/u-boot-spl:text +41.9 text +246.3
k2hk_evm : all -1280 bss -10984 data +1396 rodata +2236 spl/u-boot-spl:all +1356 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1040 text +6072
k2e_evm : all -1283 bss -10992 data +1392 rodata +2237 spl/u-boot-spl:all +1348 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1032 text +6080
k2l_evm : all -1407 bss -11108 data +1392 rodata +2237 spl/u-boot-spl:all +1348 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1032 text +6072 07: configs: ti_armv7_keystone2: switch addresses to generic addresses
arm: (for 74/74 boards) all +1.7 bss +0.1 rodata +1.7
k2l_evm : all +129 bss +88 rodata +41
k2e_evm : all +1 bss -40 rodata +41
k2hk_evm : all -3 bss -44 rodata +41
08: configs: ti_armv7_keystone2: switch to using kernel zImage
arm: (for 74/74 boards) all -1.7 bss -0.1 rodata -1.6
k2hk_evm : bss +40 rodata -40
k2e_evm : bss +40 rodata -40
k2l_evm : all -128 bss -88 rodata -40
09: configs: k2*_evm: rename skernel binary names to generated file names
arm: (for 74/74 boards) bss +0.2 rodata -0.2
k2hk_evm : bss +4 rodata -4
k2l_evm : bss +4 rodata -4
k2e_evm : bss +4 rodata -4
Nishanth Menon (8):
configs: split ti_armv7_common into a omap generic header
configs: ti: armv7_common: enable Thumb mode for all
board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR
configs: rename ks2_evm into ti_armv7_keystone2
configs: ti_armv7_keystone2: start using armv7_common
configs: ti_armv7_keystone2: switch addresses to generic addresses
configs: ti_armv7_keystone2: switch to using kernel zImage
configs: k2*_evm: rename skernel binary names to generated file names
board/ti/ks2_evm/board.c | 2 +-
include/configs/am43xx_evm.h | 2 +-
include/configs/k2e_evm.h | 8 +--
include/configs/k2hk_evm.h | 8 +--
include/configs/k2l_evm.h | 8 +--
include/configs/ti_am335x_common.h | 2 +-
include/configs/ti_armv7_common.h | 30 ++------
.../configs/{ks2_evm.h => ti_armv7_keystone2.h} | 81 ++++++++--------------
include/configs/ti_armv7_omap.h | 49 +++++++++++++
include/configs/ti_omap3_common.h | 2 +-
include/configs/ti_omap4_common.h | 2 +-
include/configs/ti_omap5_common.h | 2 +-
12 files changed, 97 insertions(+), 99 deletions(-)
rename include/configs/{ks2_evm.h => ti_armv7_keystone2.h} (82%)
create mode 100644 include/configs/ti_armv7_omap.hSignature · 1 line
2.1.4
PATCH v4 1/8 configs: split ti_armv7_common into a omap generic header
TI armv7 based SoCs are based on two architectures - one based on OMAP generation architecture and others based on Keystone architecture.
Many of the options are architecture specific, however a lot are common with v7 architecture. So, step 1 will be to move out OMAP specific stuff from ti_armv7_common into a ti_armv7_omap.h header which is then used by all the relevant architecture headers.
---
V4: update Reviewed by, no functional change
V3: https://patchwork.ozlabs.org/patch/497385/
V2: https://patchwork.ozlabs.org/patch/496820/
V1: https://patchwork.ozlabs.org/patch/496726/
include/configs/am43xx_evm.h | 2 +- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_common.h | 21 ---------------- include/configs/ti_armv7_omap.h | 49 ++++++++++++++++++++++++++++++++++++++ include/configs/ti_omap3_common.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 2 +- 7 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 include/configs/ti_armv7_omap.h
include/configs/am43xx_evm.h +1 -1
@@ -80,7 +80,7 @@#endif /* Now bring in the rest of the common code. */ -#include <configs/ti_armv7_common.h> +#include <configs/ti_armv7_omap.h> /* Always 64 KiB env size */ #define CONFIG_ENV_SIZE (64 << 10)
include/configs/ti_am335x_common.h +1 -1
@@ -94,6 +94,6 @@#endif /* Now bring in the rest of the common code. */ -#include <configs/ti_armv7_common.h> +#include <configs/ti_armv7_omap.h> #endif /* __CONFIG_TI_AM335X_COMMON_H__ */
include/configs/ti_armv7_common.h +0 -21
@@ -18,8 +18,6 @@#define __CONFIG_TI_ARMV7_COMMON_H__/* Common define for many platforms. */ -#define CONFIG_OMAP -#define CONFIG_OMAP_COMMON #define CONFIG_SYS_GENERIC_BOARD /*
@@ -86,39 +84,20 @@#define CONFIG_I2C #define CONFIG_CMD_I2C #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_OMAP24XX /* MMC/SD IP block */ #define CONFIG_MMC #define CONFIG_GENERIC_MMC -#define CONFIG_OMAP_HSMMC #define CONFIG_CMD_MMC /* McSPI IP block */ #define CONFIG_SPI -#define CONFIG_OMAP3_SPI #define CONFIG_CMD_SPI /* GPIO block */ -#define CONFIG_OMAP_GPIO #define CONFIG_CMD_GPIO /* -* GPMC NAND block. We support 1 device and the physical address to -* access CS0 at is 0x8000000. -*/ -#ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC -#ifndef CONFIG_SYS_NAND_BASE -#define CONFIG_SYS_NAND_BASE 0x8000000 -#endif -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_CMD_NAND -#endif - -/* * The following are general good-enough settings for U-Boot. We set a * large malloc pool as we generally have a lot of DDR, and we opt for * function over binary size in the main portion of U-Boot as this is
include/configs/ti_armv7_omap.h new file +49 -0
49 lines not on this page · raw message
include/configs/ti_omap3_common.h +1 -1
@@ -84,6 +84,6 @@#endif /* Now bring in the rest of the common code. */ -#include <configs/ti_armv7_common.h> +#include <configs/ti_armv7_omap.h> #endif /* __CONFIG_TI_OMAP3_COMMON_H__ */
include/configs/ti_omap4_common.h +1 -1
@@ -52,7 +52,7 @@#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS #endif -#include <configs/ti_armv7_common.h> +#include <configs/ti_armv7_omap.h> /* * Hardware drivers
include/configs/ti_omap5_common.h +1 -1
@@ -47,7 +47,7 @@#include <asm/arch/cpu.h> #include <asm/arch/omap.h> -#include <configs/ti_armv7_common.h> +#include <configs/ti_armv7_omap.h> /* * Hardware drivers
Signature · 1 line
2.1.4
PATCH v4 1/8 configs: split ti_armv7_common into a omap generic header
Quoted 10 lines · Nishanth Menon
TI armv7 based SoCs are based on two architectures - one based on OMAP generation architecture and others based on Keystone architecture.
Many of the options are architecture specific, however a lot are common with v7 architecture. So, step 1 will be to move out OMAP specific stuff from
ti_armv7_commoninto ati_armv7_omap.hheader which is then used by all the relevant architecture headers.Reviewed-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/c51fac23/attachment.sig>
PATCH v4 2/8 configs: ti: armv7_common: enable Thumb mode for all
In reply to Nishanth MenonCommit bd2c4522c26d5 ("ti: armv7: enable EXT support in SPL (using ti_armv7_common.h)") enabled thumb mode only for SPL builds, however, All TI armv7 platforms do support thumb, and there is no reason why the space savings cannot be exploited for u-boot as well.
---
new patch
include/configs/ti_armv7_common.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/configs/ti_armv7_common.h +1 -3
@@ -231,9 +231,7 @@#define CONFIG_SPL_EXT_SUPPORT #endif -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ -#endif +#define CONFIG_SYS_THUMB_BUILD /* General parts of the framework, required. */ #define CONFIG_SPL_I2C_SUPPORT
Signature · 1 line
2.1.4
PATCH v4 2/8 configs: ti: armv7_common: enable Thumb mode for all
Quoted 8 lines · Nishanth Menon
Commit
bd2c4522c26d5("ti: armv7: enable EXT support in SPL (usingti_armv7_common.h)") enabled thumb mode only for SPL builds, however, All TI armv7 platforms do support thumb, and there is no reason why the space savings cannot be exploited for u-boot as well.Reported-by Murali Karicheri <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150723/7f041975/attachment.sig>
PATCH v4 2/8 configs: ti: armv7_common: enable Thumb mode for all
In reply to Nishanth MenonQuoted 9 lines · Nishanth Menon
Commit
bd2c4522c26d5("ti: armv7: enable EXT support in SPL (usingti_armv7_common.h)") enabled thumb mode only for SPL builds, however, All TI armv7 platforms do support thumb, and there is no reason why the space savings cannot be exploited for u-boot as well.Reported-by Murali Karicheri <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/d51c4928/attachment.sig>
PATCH v4 3/8 board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR
In reply to Nishanth MenonCONFIG_LINUX_BOOT_PARAM_ADDR is not a valid configuration option. Do just like what the rest of the world does.
---
V4: picked up reviewed-by - no change
V3: https://patchwork.ozlabs.org/patch/497386/
V2: https://patchwork.ozlabs.org/patch/496821/ (new patch)
board/ti/ks2_evm/board.c | 2 +- include/configs/ks2_evm.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
board/ti/ks2_evm/board.c +1 -1
@@ -48,7 +48,7 @@ int dram_init(void)int board_init (void ) { - gd->bd->bi_boot_params =CONFIG_LINUX_BOOT_PARAM_ADDR ; + gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ;return 0 ; }
include/configs/ks2_evm.h +0 -1
@@ -307,7 +307,6 @@#define CONFIG_OF_BOARD_SETUP #define CONFIG_SYS_BARGSIZE 1024#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x08000000) -#define CONFIG_LINUX_BOOT_PARAM_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100)#define CONFIG_SUPPORT_RAW_INITRD
Signature · 1 line
2.1.4
PATCH v4 3/8 board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR
Quoted 7 lines · Nishanth Menon
CONFIG_LINUX_BOOT_PARAM_ADDRis not a valid configuration option. Do just like what the rest of the world does.Acked-by Vitaly Andrianov <[email protected]>Acked-by Murali Karicheri <[email protected]>Reviewed-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/b426a3c8/attachment.sig>
PATCH v4 4/8 configs: rename ks2_evm into ti_armv7_keystone2
In reply to Nishanth Menonrename the keystone2 common header into an keystone2 architecture specific header which can then reuse the common ti_armv7 config headers.
---
V4: no change
V3: https://patchwork.ozlabs.org/patch/497387/
include/configs/k2e_evm.h | 2 +-
include/configs/k2hk_evm.h | 2 +-
include/configs/k2l_evm.h | 2 +-
include/configs/{ks2_evm.h => ti_armv7_keystone2.h} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename include/configs/{ks2_evm.h => ti_armv7_keystone2.h} (100%)include/configs/k2e_evm.h +1 -1
@@ -27,7 +27,7 @@"name_uboot=u-boot-spi-k2e-evm.gph\0" \ "name_fs=arago-console-image-k2e-evm.cpio.gz\0" -#include <configs/ks2_evm.h> +#include <configs/ti_armv7_keystone2.h> /* SPL SPI Loader Configuration */ #define CONFIG_SPL_TEXT_BASE 0x0c100000
include/configs/k2hk_evm.h +1 -1
@@ -27,7 +27,7 @@"name_uboot=u-boot-spi-k2hk-evm.gph\0" \ "name_fs=arago-console-image-k2hk-evm.cpio.gz\0" -#include <configs/ks2_evm.h> +#include <configs/ti_armv7_keystone2.h> /* SPL SPI Loader Configuration */ #define CONFIG_SPL_TEXT_BASE 0x0c200000
include/configs/k2l_evm.h +1 -1
@@ -27,7 +27,7 @@"name_uboot=u-boot-spi-k2l-evm.gph\0" \ "name_fs=arago-console-image-k2l-evm.cpio.gz\0" -#include <configs/ks2_evm.h> +#include <configs/ti_armv7_keystone2.h> /* SPL SPI Loader Configuration */ #define CONFIG_SPL_TEXT_BASE 0x0c100000
include/configs/ti_armv7_keystone2.h renamed from include/configs/ks2_evm.h +0 -0
Signature · 1 line
2.1.4
PATCH v4 4/8 configs: rename ks2_evm into ti_armv7_keystone2
Quoted 7 lines · Nishanth Menon
rename the keystone2 common header into an keystone2 architecture specific header which can then reuse the common
ti_armv7config headers.Acked-by Vitaly Andrianov <[email protected]>Acked-by Murali Karicheri <[email protected]>Reviewed-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Applied to u-boot/master, thanks!
Signature · 9 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/39352502/attachment.sig>
PATCH v4 5/8 configs: ti_armv7_keystone2: start using armv7_common
In reply to Nishanth MenonTry to maintain as much commonality by conditionally including stuff in armv7_common as necessary and removing the common defines from keystone2 header.
Note: as part of this change, all keystone2 platforms will now start using the generic u-boot prompt instead of the custom prompt.
---
V4: no change -> only pending comment addressed in patch #2.
V3: https://patchwork.ozlabs.org/patch/497388/
V2: https://patchwork.ozlabs.org/patch/496823/
V1: https://patchwork.ozlabs.org/patch/496730/
include/configs/k2e_evm.h | 2 -- include/configs/k2hk_evm.h | 2 -- include/configs/k2l_evm.h | 2 -- include/configs/ti_armv7_common.h | 5 +++- include/configs/ti_armv7_keystone2.h | 55 ++++++++++++------------------------ 5 files changed, 22 insertions(+), 44 deletions(-)
include/configs/k2e_evm.h +0 -2
@@ -15,8 +15,6 @@#define CONFIG_K2E_EVM /* U-Boot general configuration */ -#define CONFIG_SYS_PROMPT "K2E EVM # " -#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
include/configs/k2hk_evm.h +0 -2
@@ -15,8 +15,6 @@#define CONFIG_K2HK_EVM /* U-Boot general configuration */ -#define CONFIG_SYS_PROMPT "K2HK EVM # " -#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ "addr_mon=0x0c5f0000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
include/configs/k2l_evm.h +0 -2
@@ -15,8 +15,6 @@#define CONFIG_K2L_EVM /* U-Boot general configuration */ -#define CONFIG_SYS_PROMPT "K2L EVM # " -#define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \
include/configs/ti_armv7_common.h +4 -1
@@ -74,8 +74,11 @@#define CONFIG_NR_DRAM_BANKS 1#endif #define CONFIG_SYS_SDRAM_BASE 0x80000000 + +#ifndef CONFIG_SYS_INIT_SP_ADDR #define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ GENERATED_GBL_DATA_SIZE) +#endif /* Timer information. */ #define CONFIG_SYS_PTV 2/* Divisor: 2^(PTV+1) => 8 */
@@ -140,7 +143,7 @@* mtdparts, both for ease of use in U-Boot and for passing information * on to the Linux kernel. */ -#if defined(CONFIG_SPI_BOOT ) || defined(CONFIG_NOR ) || defined(CONFIG_NAND ) +#if defined(CONFIG_SPI_BOOT ) || defined(CONFIG_NOR ) || defined(CONFIG_NAND ) || defined(CONFIG_NAND_DAVINCI )#define CONFIG_MTD_DEVICE /* Required for mtdparts */ #define CONFIG_CMD_MTDPARTS #endif
include/configs/ti_armv7_keystone2.h +18 -37
142 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH v4 5/8 configs: ti_armv7_keystone2: start using armv7_common
Quoted 8 lines · Nishanth Menon
Try to maintain as much commonality by conditionally including stuff in
armv7_commonas necessary and removing the common defines from keystone2 header.Note: as part of this change, all keystone2 platforms will now start using the generic u-boot prompt instead of the custom prompt.
Signed-off-by Nishanth Menon <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150723/9a43157f/attachment.sig>
PATCH v4 5/8 configs: ti_armv7_keystone2: start using armv7_common
In reply to Nishanth MenonQuoted 9 lines · Nishanth Menon
Try to maintain as much commonality by conditionally including stuff in
armv7_commonas necessary and removing the common defines from keystone2 header.Note: as part of this change, all keystone2 platforms will now start using the generic u-boot prompt instead of the custom prompt.
Signed-off-by Nishanth Menon <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/839af613/attachment.sig>
PATCH v4 6/8 configs: ti_armv7_keystone2: switch addresses to generic addresses
In reply to Nishanth MenonUse the defaults defined in DEFAULT_LINUX_BOOT_ENV
---
V4: only picked up reviewed-bys. no change
V3: https://patchwork.ozlabs.org/patch/497389/
include/configs/ti_armv7_keystone2.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
include/configs/ti_armv7_keystone2.h +9 -13
@@ -212,30 +212,26 @@#define CONFIG_BOOTFILE "uImage"#define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ "boot=ubi\0" \ "tftp_root=/\0" \ "nfs_root=/export\0" \ "mem_lpae=1\0" \ "mem_reserve=512M\0" \ - "addr_fdt=0x87000000\0" \ - "addr_kern=0x88000000\0" \ - "addr_uboot=0x87000000\0" \ - "addr_fs=0x82000000\0" \ "addr_ubi=0x82000000\0" \ "addr_secdb_key=0xc000000\0" \ - "fdt_high=0xffffffff\0" \ "name_kern=uImage-keystone-evm.bin\0" \ "run_mon=mon_install ${addr_mon}\0" \ - "run_kern=bootm ${addr_kern} - ${addr_fdt}\0" \ + "run_kern=bootm ${loadaddr} - ${fdtaddr}\0" \ "init_net=run args_all args_net\0" \ "init_ubi=run args_all args_ubi; " \ "ubi part ubifs; ubifsmount ubi:boot;" \ "ubifsload ${addr_secdb_key} securedb.key.bin;\0" \ - "get_fdt_net=dhcp ${addr_fdt} ${tftp_root}/${name_fdt}\0" \ - "get_fdt_ubi=ubifsload ${addr_fdt} ${name_fdt}\0" \ - "get_kern_net=dhcp ${addr_kern} ${tftp_root}/${name_kern}\0" \ - "get_kern_ubi=ubifsload ${addr_kern} ${name_kern}\0" \ + "get_fdt_net=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0" \ + "get_fdt_ubi=ubifsload ${fdtaddr} ${name_fdt}\0" \ + "get_kern_net=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0" \ + "get_kern_ubi=ubifsload ${loadaddr} ${name_kern}\0" \ "get_mon_net=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0" \ "get_mon_ubi=ubifsload ${addr_mon} ${name_mon}\0" \ "get_uboot_net=dhcp ${addr_uboot} ${tftp_root}/${name_uboot}\0" \
@@ -248,10 +244,10 @@"root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \"${nfs_options} ip=dhcp\0" \"nfs_options=v3,tcp,rsize=4096,wsize=4096\0" \ -"get_fdt_ramfs=dhcp ${addr_fdt} ${tftp_root}/${name_fdt}\0" \ -"get_kern_ramfs=dhcp ${addr_kern} ${tftp_root}/${name_kern}\0" \ +"get_fdt_ramfs=dhcp ${fdtaddr} ${tftp_root}/${name_fdt}\0" \ +"get_kern_ramfs=dhcp ${loadaddr} ${tftp_root}/${name_kern}\0" \"get_mon_ramfs=dhcp ${addr_mon} ${tftp_root}/${name_mon}\0" \ -"get_fs_ramfs=dhcp ${addr_fs} ${tftp_root}/${name_fs}\0" \ +"get_fs_ramfs=dhcp ${rdaddr} ${tftp_root}/${name_fs}\0" \"get_ubi_net=dhcp ${addr_ubi} ${tftp_root}/${name_ubi}\0" \"burn_ubi=nand erase.part ubifs; " \"nand write ${addr_ubi} ubifs ${filesize}\0" \
Signature · 1 line
2.1.4
PATCH v4 6/8 configs: ti_armv7_keystone2: switch addresses to generic addresses
Quoted 5 lines · Nishanth Menon
Use the defaults defined in
DEFAULT_LINUX_BOOT_ENVReviewed-by Murali Karicheri <[email protected]>Reviewed-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/6b928af8/attachment.sig>
PATCH v4 7/8 configs: ti_armv7_keystone2: switch to using kernel zImage
In reply to Nishanth MenonSwitch to using zImage instead of uImage. and while at it, start using bootz as default. While at it, get rid of BOOTIMAGE define and start using Linux upstream dtb file names.
---
V4: no change. only picked up reviewed-bys
V3: https://patchwork.ozlabs.org/patch/497390/
include/configs/k2e_evm.h | 2 +- include/configs/k2hk_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- include/configs/ti_armv7_keystone2.h | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-)
include/configs/k2e_evm.h +1 -1
@@ -19,7 +19,7 @@"addr_mon=0x0c140000\0" \"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ -"name_fdt=uImage-k2e-evm.dtb\0" \ +"name_fdt=k2e-evm.dtb\0" \"name_mon=skern-k2e-evm.bin\0" \"name_ubi=k2e-evm-ubifs.ubi\0" \"name_uboot=u-boot-spi-k2e-evm.gph\0" \
include/configs/k2hk_evm.h +1 -1
@@ -19,7 +19,7 @@"addr_mon=0x0c5f0000\0" \"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ -"name_fdt=uImage-k2hk-evm.dtb\0" \ +"name_fdt=k2hk-evm.dtb\0" \"name_mon=skern-k2hk-evm.bin\0" \"name_ubi=k2hk-evm-ubifs.ubi\0" \"name_uboot=u-boot-spi-k2hk-evm.gph\0" \
include/configs/k2l_evm.h +1 -1
@@ -19,7 +19,7 @@"addr_mon=0x0c140000\0" \"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \ -"name_fdt=uImage-k2l-evm.dtb\0" \ +"name_fdt=k2l-evm.dtb\0" \"name_mon=skern-k2l-evm.bin\0" \"name_ubi=k2l-evm-ubifs.ubi\0" \"name_uboot=u-boot-spi-k2l-evm.gph\0" \
include/configs/ti_armv7_keystone2.h +2 -3
@@ -210,7 +210,6 @@/* EDMA3 */ #define CONFIG_TI_EDMA3 -#define CONFIG_BOOTFILE "uImage"#define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \
@@ -221,9 +220,9 @@"mem_reserve=512M\0" \"addr_ubi=0x82000000\0" \"addr_secdb_key=0xc000000\0" \ -"name_kern=uImage-keystone-evm.bin\0" \ +"name_kern=zImage\0" \"run_mon=mon_install ${addr_mon}\0" \ -"run_kern=bootm ${loadaddr} - ${fdtaddr}\0" \ +"run_kern=bootz ${loadaddr} - ${fdtaddr}\0" \"init_net=run args_all args_net\0" \"init_ubi=run args_all args_ubi; " \"ubi part ubifs; ubifsmount ubi:boot;" \
Signature · 1 line
2.1.4
PATCH v4 7/8 configs: ti_armv7_keystone2: switch to using kernel zImage
Quoted 7 lines · Nishanth Menon
Switch to using zImage instead of uImage. and while at it, start using bootz as default. While at it, get rid of BOOTIMAGE define and start using Linux upstream dtb file names.
Reviewed-by Murali Karicheri <[email protected]>Reviewed-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/2bb46ed0/attachment.sig>
PATCH v4 8/8 configs: k2*_evm: rename skernel binary names to generated file names
In reply to Nishanth Menonusing http://git.ti.com/keystone-linux/boot-monitor/trees/master as reference (tag K2_BM_15.07) the generated files do not have evm extensions by default. So dont use -evm extension.
---
V4: no change - only picked up reviewed bys.
V3: https://patchwork.ozlabs.org/patch/497391/
include/configs/k2e_evm.h | 2 +- include/configs/k2hk_evm.h | 2 +- include/configs/k2l_evm.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/configs/k2e_evm.h +1 -1
@@ -20,7 +20,7 @@"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \"name_fdt=k2e-evm.dtb\0" \ -"name_mon=skern-k2e-evm.bin\0" \ +"name_mon=skern-k2e.bin\0" \"name_ubi=k2e-evm-ubifs.ubi\0" \"name_uboot=u-boot-spi-k2e-evm.gph\0" \"name_fs=arago-console-image-k2e-evm.cpio.gz\0"
include/configs/k2hk_evm.h +1 -1
@@ -20,7 +20,7 @@"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \"name_fdt=k2hk-evm.dtb\0" \ -"name_mon=skern-k2hk-evm.bin\0" \ +"name_mon=skern-k2hk.bin\0" \"name_ubi=k2hk-evm-ubifs.ubi\0" \"name_uboot=u-boot-spi-k2hk-evm.gph\0" \"name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
include/configs/k2l_evm.h +1 -1
@@ -20,7 +20,7 @@"args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \"root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \"name_fdt=k2l-evm.dtb\0" \ -"name_mon=skern-k2l-evm.bin\0" \ +"name_mon=skern-k2l.bin\0" \"name_ubi=k2l-evm-ubifs.ubi\0" \"name_uboot=u-boot-spi-k2l-evm.gph\0" \"name_fs=arago-console-image-k2l-evm.cpio.gz\0"
Signature · 1 line
2.1.4
PATCH v4 8/8 configs: k2*_evm: rename skernel binary names to generated file names
Quoted 7 lines · Nishanth Menon
using http://git.ti.com/keystone-linux/boot-monitor/trees/master as reference (tag K2_BM_15.07) the generated files do not have evm extensions by default. So dont use -evm extension.
Reviewed-by Murali Karicheri <[email protected]>Reviewed-by Tom Rini <[email protected]>Signed-off-by Nishanth Menon <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/3a850a13/attachment.sig>
v4 cover configs: make keystone2 configs start using armv7 common header
In reply to Nishanth MenonQuoted 106 lines · Nishanth Menon
Changes since v3:
- picked up V3 reviewed bys
- Dropped the original 8/8 patch (ramdisk) introduced patch #3 (thumb mode) (dropped patch = https://patchwork.ozlabs.org/patch/497392/ )Tested on K2HK-evm
OMAP4 Panda: http://pastebin.ubuntu.com/11922876/
AM57xx Beagle-X15: http://pastebin.ubuntu.com/11922884/
OMAP5 uevm: http://pastebin.ubuntu.com/11922947/
AM437x-sk: http://pastebin.ubuntu.com/11922954/V3: http://marc.info/?l=u-boot&m=143723766211035&w=2
V2: http://marc.info/?l=u-boot&m=143707376106583&w=2
V1: http://marc.info/?l=u-boot&m=143706008602124&w=2buildman report:
./tools/buildman/buildman-b k2h/config-cleanups-v4 -sSd omap4 omap5 omap3 am33xx keystone boards.cfg is up to date. Nothing to do.
Summary of 9 commits for 74 boards (20 threads, 1 job per thread)
01: Merge branch 'master' ofgit://git.denx.de/u-boot-fsl-qoriq
arm: +am335x_boneblack_vboot
02: configs: splitti_armv7_commoninto a omap generic header
03: configs: ti:armv7_common: enable Thumb mode for allarm: (for 74/74 boards) all -43015.7 bss +1.6 text -43017.4 pepper : all -65176 bss -16 text -65160 cairo : all -70032 bss +8 text -70040 cm_t54 : all -72384 bss +36 text -72420 igep0032 : all -72392 text -72392 igep0020 : all -72456 bss +32 text -72488 igep0030 : all -72456 bss +24 text -72480 omap5_uevm : all -74344 bss +4 text -74348 devkit8000 : all -77880 text -77880 beagle_x15 : all -78264 bss -52 text -78212 cm_t335 : all -80400 bss -24 text -80376 pcm051_rev3 : all -81496 bss -8 text -81488 pcm051_rev1 : all -81496 bss -8 text -81488 am335x_igep0033: all -81816 bss +32 text -81848 igep0020_nand : all -82328 bss +32 text -82360 igep0030_nand : all -82392 bss -48 text -82344 omap3_zoom1 : all -82448 text -82448 pengwyn : all -91840 bss +32 text -91872 dra7xx_evm_uart3: all -92168 bss +32 text -92200 dra7xx_evm_qspiboot: all -92168 bss -52 text -92116 dra7xx_evm : all -92232 bss +16 text -92248 am43xx_evm_ethboot: all -92704 bss -16 text -92688 am43xx_evm : all -92736 text -92736 omap3_pandora : all -95360 bss +32 text -95392 birdland_bav335a: all -98200 bss +40 text -98240 birdland_bav335b: all -98200 bss +40 text -98240 omap3_beagle : all -98308 bss -8 text -98300 am335x_boneblack: all -100400 bss +16 text -100416 am43xx_evm_usbhost_boot: all -101496 bss -24 text -101472 am335x_boneblack_vboot: all -102952 bss +24 text -102976 am335x_evm_spiboot: all -103528 bss -24 text -103504 am335x_evm_usbspl: all -115632 bss +48 text -115680 omap3_overo : all -115840 bss -16 text -115824 am335x_evm : all -117104 bss -8 text -117096 am335x_evm_nor : all -123240 bss -32 text -123208 am335x_baltos : all -131296 bss +8 text -131304 04: board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR 05: configs: rename ks2_evm into ti_armv7_keystone2 06: configs: ti_armv7_keystone2: start using armv7_common arm: (for 74/74 boards) all -53.6 bss -447.1 data +56.5 rodata +90.7 spl/u-boot-spl:all +54.8 spl/u-boot-spl:data +5.4 spl/u-boot-spl:rodata +7.5 spl/u-boot-spl:text +41.9 text +246.3 k2hk_evm : all -1280 bss -10984 data +1396 rodata +2236 spl/u-boot-spl:all +1356 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1040 text +6072 k2e_evm : all -1283 bss -10992 data +1392 rodata +2237 spl/u-boot-spl:all +1348 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1032 text +6080 k2l_evm : all -1407 bss -11108 data +1392 rodata +2237 spl/u-boot-spl:all +1348 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1032 text +607207: configs:
ti_armv7_keystone2: switch addresses to generic addresses
arm: (for 74/74 boards) all +1.7 bss +0.1 rodata +1.7
k2l_evm: all +129 bss +88 rodata +41
k2e_evm: all +1 bss -40 rodata +41
k2hk_evm: all -3 bss -44 rodata +41
08: configs:ti_armv7_keystone2: switch to using kernel zImage
arm: (for 74/74 boards) all -1.7 bss -0.1 rodata -1.6
k2hk_evm: bss +40 rodata -40
k2e_evm: bss +40 rodata -40
k2l_evm: all -128 bss -88 rodata -40
09: configs: k2*_evm: rename skernel binary names to generated file names
arm: (for 74/74 boards) bss +0.2 rodata -0.2
k2hk_evm: bss +4 rodata -4
k2l_evm: bss +4 rodata -4
k2e_evm: bss +4 rodata -4Nishanth Menon (8):
configs: splitti_armv7_commoninto a omap generic header
configs: ti:armv7_common: enable Thumb mode for all
board:ks2_evm: get rid of bogusCONFIG_LINUX_BOOT_PARAM_ADDR
configs: renameks2_evmintoti_armv7_keystone2
configs:ti_armv7_keystone2: start usingarmv7_common
configs:ti_armv7_keystone2: switch addresses to generic addresses
configs:ti_armv7_keystone2: switch to using kernel zImage
configs: k2*_evm: rename skernel binary names to generated file namesboard/ti/ks2_evm/board.c | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/k2e_evm.h | 8 +-- include/configs/k2hk_evm.h | 8 +-- include/configs/k2l_evm.h | 8 +-- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_common.h | 30 ++------ .../configs/{ks2_evm.h => ti_armv7_keystone2.h} | 81 ++++++++-------------- include/configs/ti_armv7_omap.h | 49 +++++++++++++ include/configs/ti_omap3_common.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 2 +- 12 files changed, 97 insertions(+), 99 deletions(-)
Quoted 3 lines
rename
include/configs/{ks2_evm.h=>ti_armv7_keystone2.h} (82%) create mode 100644include/configs/ti_armv7_omap.h
Looks good to me. Thanks for working on this.
Signature · 2 lines
Murali Karicheri Linux Kernel, Keystone