Skip to contentSkip to conversation

configs: make keystone2 config to start using arm_v7_common header

PATCH Superseded Nishanth Menon 3 participants 25 messages Jul 18, 2015 – Jul 22, 2015

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Nishanth Menon

author
#0 lore raw

v3 cover configs: make keystone2 config to start using arm_v7_common header

For legacy reasons, keystone2 had kind of stayed completely seperated from the rest of the TI SoC families. This makes no sense since there are a lot of common definitions that can be reused between all SoC configuration allowing for a consistent user experience.

So make keystone2 follow the rest of the TI SoCs based on OMAP architecture as well.

Test log: http://pastebin.ubuntu.com/11899472/ using ( http://pastebin.ubuntu.com/11899472/)

Changes in V3:
- Cleanup MMC as part of review comments
- Started using common addresses and got rid of fdt_addr_high.
- Additional consolidation
- picked up acks from previous patches

V2: http://marc.info/?l=u-boot&m=143707376106583&w=2
V1: http://marc.info/?l=u-boot&m=143706008602124&w=2

Nishanth Menon (8):
configs: split ti_armv7_common into a omap generic header
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
ti_armv7_keystone2: switch to using kernel zImage
configs: k2*_evm: rename skernel binary names to generated file names
configs: keystone2: remove distro specific ramdisk name

 board/ti/ks2_evm/board.c                           |  2 +-
 include/configs/am43xx_evm.h                       |  2 +-
 include/configs/k2e_evm.h                          |  9 +--
 include/configs/k2hk_evm.h                         |  9 +--
 include/configs/k2l_evm.h                          |  9 +--
 include/configs/ti_am335x_common.h                 |  2 +-
 include/configs/ti_armv7_common.h                  | 26 ++-----
 .../configs/{ks2_evm.h => ti_armv7_keystone2.h}    | 82 ++++++++--------------
 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.h
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH v3 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.

Signed-off-by Nishanth Menon <[email protected]>

---
V3: No change
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
index 33e534a76583..65ac8ef34eb8 100644
@@ -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
index 4d2ae280e7f1..9697431b4496 100644
@@ -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
index 0aea7d12ec16..63244dbc83ff 100644
@@ -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
index 429b109afa23..be231a551361 100644
@@ -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
index e96613406b3b..959f312edb5b 100644
@@ -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
index f3e5a7587de9..789542be6710 100644
@@ -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
#2 lore raw

PATCH v3 1/8 configs: split ti_armv7_common into a omap generic header

Quoted 9 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_common into a ti_armv7_omap.h header which is then used by all the relevant architecture headers.

Signed-off-by Nishanth Menon <[email protected]>
Reviewed-by Tom Rini <[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/20150722/70262c6f/attachment.sig>
author
#3 lore raw

PATCH v3 2/8 board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR

In reply to Nishanth Menon

CONFIG_LINUX_BOOT_PARAM_ADDR is 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]>
Signed-off-by Nishanth Menon <[email protected]>

---
V3: picked up acks - else no change
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
index 8892a2843df4..0cefb3404403 100644
@@ -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
index e05d56cd8262..d838f270018b 100644
@@ -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
#4 lore raw

PATCH v3 2/8 board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR

Quoted 6 lines · Nishanth Menon

CONFIG_LINUX_BOOT_PARAM_ADDR is 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]>
Signed-off-by Nishanth Menon <[email protected]>
Reviewed-by Tom Rini <[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/20150722/76d9a50d/attachment.sig>
author
#5 lore raw

PATCH v3 3/8 configs: rename ks2_evm into ti_armv7_keystone2

In reply to Nishanth Menon

rename the keystone2 common header into an keystone2 architecture specific header which can then reuse the common ti_armv7 config headers.

Acked-by Vitaly Andrianov <[email protected]>
Acked-by Murali Karicheri <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>

---
V3: picked up acks, no change.
V2: https://patchwork.ozlabs.org/patch/496822/ (no change)
V1: https://patchwork.ozlabs.org/patch/496728/

 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
index a28ceb7064a7..ac50a01b2980 100644
@@ -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
index eae772178338..29e3403aa082 100644
@@ -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
index 57da0579255a..50d5c991a0bb 100644
@@ -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
similarity index 100%
rename from include/configs/ks2_evm.h
rename to include/configs/ti_armv7_keystone2.h
Signature · 1 line
2.1.4
#6 lore raw

PATCH v3 3/8 configs: rename ks2_evm into ti_armv7_keystone2

include/configs/ti_armv7_keystone2.h

Quoted 61 lines · Nishanth Menon

rename the keystone2 common header into an keystone2 architecture specific header which can then reuse the common ti_armv7 config headers.

Acked-by Vitaly Andrianov <[email protected]>
Acked-by Murali Karicheri <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>

---
V3: picked up acks, no change.
V2: https://patchwork.ozlabs.org/patch/496822/ (no change)
V1: https://patchwork.ozlabs.org/patch/496728/

  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
index a28ceb7064a7..ac50a01b2980 100644
@@ -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
index eae772178338..29e3403aa082 100644
@@ -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
index 57da0579255a..50d5c991a0bb 100644
@@ -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
similarity index 100%
rename from include/configs/ks2_evm.h
rename to include/configs/ti_armv7_keystone2.h
Reviewed-by Murali Karicheri <[email protected]>
Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#7 lore raw

PATCH v3 3/8 configs: rename ks2_evm into ti_armv7_keystone2

In reply to Nishanth Menon

include/configs/ti_armv7_keystone2.h

Quoted 61 lines · Nishanth Menon

rename the keystone2 common header into an keystone2 architecture specific header which can then reuse the common ti_armv7 config headers.

Acked-by Vitaly Andrianov <[email protected]>
Acked-by Murali Karicheri <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>

---
V3: picked up acks, no change.
V2: https://patchwork.ozlabs.org/patch/496822/ (no change)
V1: https://patchwork.ozlabs.org/patch/496728/

  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
index a28ceb7064a7..ac50a01b2980 100644
@@ -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
index eae772178338..29e3403aa082 100644
@@ -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
index 57da0579255a..50d5c991a0bb 100644
@@ -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
similarity index 100%
rename from include/configs/ks2_evm.h
rename to include/configs/ti_armv7_keystone2.h
Reviewed-by Murali Karicheri <[email protected]>
Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#8 lore raw

PATCH v3 3/8 configs: rename ks2_evm into ti_armv7_keystone2

In reply to Nishanth Menon
Quoted 6 lines · Nishanth Menon

rename the keystone2 common header into an keystone2 architecture specific header which can then reuse the common ti_armv7 config headers.

Acked-by Vitaly Andrianov <[email protected]>
Acked-by Murali Karicheri <[email protected]>
Signed-off-by Nishanth Menon <[email protected]>
Reviewed-by Tom Rini <[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/20150722/6caaeb23/attachment.sig>
author
#9 lore raw

PATCH v3 4/8 configs: ti_armv7_keystone2: start using armv7_common

In reply to Nishanth Menon

Try 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.

Signed-off-by Nishanth Menon <[email protected]>

---
Changes in V3:
- undefed MMC from ks2
- removed white space introduced (review comments)
- address change review comment is split off as patch 5

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
index ac50a01b2980..f1e650141ae1 100644
@@ -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
index 29e3403aa082..f8e83de64b63 100644
@@ -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
index 50d5c991a0bb..395608a5f6db 100644
@@ -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
index 63244dbc83ff..68bfed28820c 100644
@@ -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
#10 lore raw

PATCH v3 4/8 configs: ti_armv7_keystone2: start using armv7_common

include/configs/ti_armv7_keystone2.h line 20

Quoted 11 lines · Nishanth Menon

Try to maintain as much commonality by conditionally including stuff in armv7_common as necessary and removing the common defines from keystone2 header.

  /* U-Boot Build Configuration */
  #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is a 2nd stage loader */
include/configs/ti_armv7_keystone2.h +0 -3
-#define CONFIG_SYS_NO_FLASH		/* that is, no *NOR* flash */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
  #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SYS_THUMB_BUILD

One thing I see is THUMB build is only enabled for SPL build in ti_armv7_common.h. With this transition, regular build will not be using THUMB build anymore. This is not right. Please fix it. Many platforms configs such as tbs2910.h, colibri_vf.h, highbank.h etc has this enabled for both builds as this will reduce the image size.

Quoted 2 lines

/* SoC Configuration */

Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#11 lore raw

PATCH v3 4/8 configs: ti_armv7_keystone2: start using armv7_common

Quoted 6 lines · Murali Karicheri
Quoted 5 lines · Nishanth Menon

Try to maintain as much commonality by conditionally including stuff in armv7_common as necessary and removing the common defines from keystone2 header.

Quoted 12 lines

include/configs/ti_armv7_keystone2.h line 20

Quoted 6 lines

/* U-Boot Build Configuration */
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage loader */

include/configs/ti_armv7_keystone2.h +0 -3
-#define CONFIG_SYS_NO_FLASH		/* that is, no *NOR* flash */
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SYS_THUMB_BUILD

One thing I see is THUMB build is only enabled for SPL build in ti_armv7_common.h. With this transition, regular build will not be using THUMB build anymore. This is not right. Please fix it. Many platforms configs such as tbs2910.h, colibri_vf.h, highbank.h etc has this enabled for both builds as this will reduce the image size.

Good point. Lets just whack thumb on for all platforms (so after the patch to make things include ti_armv7_omap.h, add that in). 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/20150722/53f7eafa/attachment.sig>
author
#12 lore raw

PATCH v3 5/8 configs: ti_armv7_keystone2: switch addresses to generic addresses

In reply to Nishanth Menon

Use the defaults defined in DEFAULT_LINUX_BOOT_ENV

Signed-off-by Nishanth Menon <[email protected]>

---
new patch based on review comments on https://patchwork.ozlabs.org/patch/496823/

 include/configs/ti_armv7_keystone2.h | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
include/configs/ti_armv7_keystone2.h +9 -13
index 0e67cf0ebd75..ddc2e23f1370 100644
@@ -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
#13 lore raw

PATCH v3 5/8 configs: ti_armv7_keystone2: switch addresses to generic addresses

Quoted 55 lines · Nishanth Menon

Use the defaults defined in DEFAULT_LINUX_BOOT_ENV

Signed-off-by Nishanth Menon <[email protected]>

---
new patch based on review comments on https://patchwork.ozlabs.org/patch/496823/

  include/configs/ti_armv7_keystone2.h | 22 +++++++++-------------
  1 file changed, 9 insertions(+), 13 deletions(-)
include/configs/ti_armv7_keystone2.h +6 -10
index 0e67cf0ebd75..ddc2e23f1370 100644
@@ -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"			\

include/configs/ti_armv7_keystone2.h line 253

Quoted 10 lines
include/configs/ti_armv7_keystone2.h +3 -3
-	"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"		\
Reviewed-by Murali Karicheri <[email protected]>
Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#14 lore raw

PATCH v3 5/8 configs: ti_armv7_keystone2: switch addresses to generic addresses

In reply to Nishanth Menon
Quoted 3 lines · Nishanth Menon

Use the defaults defined in DEFAULT_LINUX_BOOT_ENV

Signed-off-by Nishanth Menon <[email protected]>
Reviewed-by Tom Rini <[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/20150722/1775f62a/attachment.sig>
author
#15 lore raw

PATCH v3 6/8 ti_armv7_keystone2: switch to using kernel zImage

In reply to 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.

Signed-off-by Nishanth Menon <[email protected]>

---
New patch.

 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
index f1e650141ae1..afb289ca4bad 100644
@@ -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
index f8e83de64b63..c2d3ec7c70cb 100644
@@ -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
index 395608a5f6db..1957287a57c7 100644
@@ -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
index ddc2e23f1370..e327f3e03073 100644
@@ -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
#16 lore raw

PATCH v3 6/8 ti_armv7_keystone2: switch to using kernel zImage

Quoted 68 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.

Signed-off-by Nishanth Menon <[email protected]>

---
New patch.

  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
index f1e650141ae1..afb289ca4bad 100644
@@ -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
index f8e83de64b63..c2d3ec7c70cb 100644
@@ -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
index 395608a5f6db..1957287a57c7 100644
@@ -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 +0 -1
index ddc2e23f1370..e327f3e03073 100644
@@ -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"						\

include/configs/ti_armv7_keystone2.h line 228

Quoted 10 lines
include/configs/ti_armv7_keystone2.h +2 -2
  	"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;"			\
Reviewed-by Murali Karicheri <[email protected]>
Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#17 lore raw

PATCH v3 6/8 ti_armv7_keystone2: switch to using kernel zImage

In reply to Nishanth Menon
Quoted 5 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.

Signed-off-by Nishanth Menon <[email protected]>
Reviewed-by Tom Rini <[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/20150722/a5633db3/attachment.sig>
author
#18 lore raw

PATCH v3 7/8 configs: k2*_evm: rename skernel binary names to generated file names

In reply to 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.

Signed-off-by Nishanth Menon <[email protected]>

---
New patch

 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
index afb289ca4bad..4f4ebf53ec59 100644
@@ -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
index c2d3ec7c70cb..6c6dcb1e5ed3 100644
@@ -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
index 1957287a57c7..9bacfa49c430 100644
@@ -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
#19 lore raw

PATCH v3 7/8 configs: k2*_evm: rename skernel binary names to generated file names

Quoted 45 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.

Signed-off-by Nishanth Menon <[email protected]>

---
New patch

  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
index afb289ca4bad..4f4ebf53ec59 100644
@@ -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
index c2d3ec7c70cb..6c6dcb1e5ed3 100644
@@ -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 +0 -0
index 1957287a57c7..9bacfa49c430 100644

include/configs/k2l_evm.h line 26

Quoted 8 lines
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"
Reviewed-by Murali Karicheri <[email protected]>
Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#20 lore raw

PATCH v3 7/8 configs: k2*_evm: rename skernel binary names to generated file names

In reply to Nishanth Menon
Quoted 5 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.

Signed-off-by Nishanth Menon <[email protected]>
Reviewed-by Tom Rini <[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/20150722/018041de/attachment.sig>
author
#21 lore raw

PATCH v3 8/8 configs: keystone2: remove distro specific ramdisk name

In reply to Nishanth Menon

u-boot should support multiple distros as necessary. So, DONOT hardcode distro specific image name in package. Instead we use a generic ramdisk.gz as image name which can be modified by distro specific logic.

Signed-off-by Nishanth Menon <[email protected]>

---
New patch

 include/configs/k2e_evm.h            | 1 -
 include/configs/k2hk_evm.h           | 1 -
 include/configs/k2l_evm.h            | 1 -
 include/configs/ti_armv7_keystone2.h | 1 +
 4 files changed, 1 insertion(+), 3 deletions(-)
include/configs/k2e_evm.h +0 -1
index 4f4ebf53ec59..59ce6fa0bdb3 100644
@@ -23,7 +23,6 @@
 	"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/ti_armv7_keystone2.h>
include/configs/k2hk_evm.h +0 -1
index 6c6dcb1e5ed3..835dd0e13b4b 100644
@@ -23,7 +23,6 @@
 	"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/ti_armv7_keystone2.h>
include/configs/k2l_evm.h +0 -1
index 9bacfa49c430..a7c835953b73 100644
@@ -23,7 +23,6 @@
 	"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"
 
 #include <configs/ti_armv7_keystone2.h>
include/configs/ti_armv7_keystone2.h +1 -0
index e327f3e03073..198e3650fd55 100644
@@ -221,6 +221,7 @@
 	"addr_ubi=0x82000000\0"						\
 	"addr_secdb_key=0xc000000\0"					\
 	"name_kern=zImage\0"						\
+	"name_fs=ramdisk.gz\0"						\
 	"run_mon=mon_install ${addr_mon}\0"				\
 	"run_kern=bootz ${loadaddr} - ${fdtaddr}\0"			\
 	"init_net=run args_all args_net\0"				\
Signature · 1 line
2.1.4
#22 lore raw

PATCH v3 8/8 configs: keystone2: remove distro specific ramdisk name

Quoted 56 lines · Nishanth Menon

u-boot should support multiple distros as necessary. So, DONOT hardcode distro specific image name in package. Instead we use a generic ramdisk.gz as image name which can be modified by distro specific logic.

Signed-off-by Nishanth Menon <[email protected]>

---
New patch

  include/configs/k2e_evm.h            | 1 -
  include/configs/k2hk_evm.h           | 1 -
  include/configs/k2l_evm.h            | 1 -
  include/configs/ti_armv7_keystone2.h | 1 +
  4 files changed, 1 insertion(+), 3 deletions(-)
include/configs/k2e_evm.h +0 -1
index 4f4ebf53ec59..59ce6fa0bdb3 100644
@@ -23,7 +23,6 @@
  	"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/ti_armv7_keystone2.h>
include/configs/k2hk_evm.h +0 -1
index 6c6dcb1e5ed3..835dd0e13b4b 100644
@@ -23,7 +23,6 @@
  	"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/ti_armv7_keystone2.h>
include/configs/k2l_evm.h +0 -1
index 9bacfa49c430..a7c835953b73 100644
@@ -23,7 +23,6 @@
  	"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"
 
  #include <configs/ti_armv7_keystone2.h>
include/configs/ti_armv7_keystone2.h +0 -0
index e327f3e03073..198e3650fd55 100644

include/configs/ti_armv7_keystone2.h line 227

Quoted 7 lines
include/configs/ti_armv7_keystone2.h +1 -0
@@ -221,6 +221,7 @@
  	"addr_ubi=0x82000000\0"						\
  	"addr_secdb_key=0xc000000\0"					\
  	"name_kern=zImage\0"						\
+	"name_fs=ramdisk.gz\0"						\
  	"run_mon=mon_install ${addr_mon}\0"				\
  	"run_kern=bootz ${loadaddr} - ${fdtaddr}\0"			\
  	"init_net=run args_all args_net\0"				\
Reviewed-by Murali Karicheri <[email protected]>
Signature · 2 lines
Murali Karicheri
Linux Kernel, Keystone
#23 lore raw

PATCH v3 8/8 configs: keystone2: remove distro specific ramdisk name

In reply to Nishanth Menon
Quoted 5 lines · Nishanth Menon

u-boot should support multiple distros as necessary. So, DONOT hardcode distro specific image name in package. Instead we use a generic ramdisk.gz as image name which can be modified by distro specific logic.

Signed-off-by Nishanth Menon <[email protected]>

Instead of trying to whack this stuff to be more generic lets just punt on it and drop when moving to config_distro_bootcmd.h

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/20150722/e0fe25b5/attachment.sig>
author
#24 lore raw

PATCH v3 8/8 configs: keystone2: remove distro specific ramdisk name

Quoted 3 lines · Tom Rini

Instead of trying to whack this stuff to be more generic lets just punt on it and drop when moving to config_distro_bootcmd.h

OK. will do so.

Signature · 3 lines
---
Regards,
Nishanth Menon