September 2016 - U-Boot

[U-Boot] [PATCH v2 0/3] ARM: TI: Enable DISPLAY_{CPU/BOARD}INFO
by Lokesh Vutla 04 Oct '16

04 Oct '16

This series adds ID code detection support for AM437x and enables CONFIG_DISPLAY_{CPU/BOARD}INFO on all TI platforms. This series is based on top of Andrew's (Kconfig: Separate AM33XX SOC config from target board config) patch[1] I specifically did not use tools/moveconfig.py as Tom suggested to select these configs from targets instead of enabling it in defconfigs. [1] http://patchwork.ozlabs.org/patch/662954/ Lokesh Vutla (3): ARM: AM437X: Add Silicon ID support ARM: TI: Enable DISPLAY_CPUINFO on all SoCs ARM: TI: Enable DISPLAY_BOARDINFO on all boards arch/arm/Kconfig | 6 ++++++ arch/arm/cpu/armv7/am33xx/Kconfig | 11 +++++++++++ arch/arm/cpu/armv7/am33xx/sys_info.c | 5 ++++- arch/arm/cpu/armv7/omap3/Kconfig | 8 ++++++++ arch/arm/cpu/armv7/omap5/Kconfig | 4 ++++ arch/arm/include/asm/arch-am33xx/cpu.h | 3 ++- arch/arm/mach-keystone/Kconfig | 4 ++++ arch/powerpc/cpu/ppc4xx/Kconfig | 14 ++++++++++++++ board/amcc/acadia/Kconfig | 4 ---- board/amcc/bamboo/Kconfig | 4 ---- board/amcc/bubinga/Kconfig | 4 ---- board/amcc/canyonlands/Kconfig | 4 ---- board/amcc/katmai/Kconfig | 4 ---- board/amcc/kilauea/Kconfig | 4 ---- board/amcc/luan/Kconfig | 4 ---- board/amcc/makalu/Kconfig | 4 ---- board/amcc/redwood/Kconfig | 4 ---- board/amcc/sequoia/Kconfig | 4 ---- board/amcc/walnut/Kconfig | 4 ---- board/amcc/yosemite/Kconfig | 4 ---- board/amcc/yucca/Kconfig | 4 ---- board/liebherr/lwmon5/Kconfig | 4 ---- common/Kconfig | 16 ++++++++++++++++ include/configs/ti_armv7_keystone2.h | 1 - include/configs/ti_omap4_common.h | 2 -- include/configs/ti_omap5_common.h | 3 --- 26 files changed, 69 insertions(+), 64 deletions(-) -- 2.9.3

3 9

[U-Boot] [PATCH 1/2] rockchip: use rockchip linux partitions layout
by Jacob Chen 03 Oct '16

03 Oct '16

Unify the partitions of each chip then it will be more easy for us to write scripts, tools or guides for rockchip chips. Those extra partitions mostly are used to be compatible with our internal loaders (such as miniloader which was same as spl, or android loader then we can support dual boot) Signed-off-by: Jacob Chen <jacob2.chen(a)rock-chips.com> --- include/configs/rk3036_common.h | 7 ++++++- include/configs/rk3288_common.h | 7 ++++++- include/configs/rk3399_common.h | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 6ddf0d9..17335f6 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -94,7 +94,12 @@ #define CONFIG_RANDOM_UUID #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ /* First try to boot from SD (index 0), then eMMC (index 1 */ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index e8bf987..4b19e9d 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -111,7 +111,12 @@ #define CONFIG_RANDOM_UUID #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ /* First try to boot from SD (index 0), then eMMC (index 1 */ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 93d5856..5a41c93 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -67,7 +67,12 @@ #define CONFIG_PARTITION_UUIDS #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=16M,size=32M,bootable;" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ /* First try to boot from SD (index 0), then eMMC (index 1) */ -- 1.9.1

2 3

[U-Boot] [RFC PATCH 0/6] Move some config macros to Kconfig
by York Sun 03 Oct '16

03 Oct '16

Guys, I try to move some config macros to Kconfig. This is a beginning. Please review this set and let me know. [RFC PATCH 1/6] arm: Fix Kconfig for proper display menu [RFC PATCH 2/6] arm: Move FSL_LSCH2 FSL_LSCH3 to Kconfig [RFC PATCH 3/6] arm: Move MAX_CPUS to Kconfig [RFC PATCH 4/6] arm: Move SYS_FSL_IFC_BANK_COUNT to Kconfig [RFC PATCH 5/6] arm: Move FSL_HAS_DP_DDR and NUM_DDR_CONTROLLERS to [RFC PATCH 6/6] arm: Move SYS_FSL_SRDS_* and SYS_HAS_SERDES to Kconfig York

2 12

[U-Boot] [[RFC Patch] 1/2] tools: buildmand: Remove duplicated code
by York Sun 03 Oct '16

03 Oct '16

Signed-off-by: York Sun <york.sun(a)nxp.com> CC: Simon Glass <sjg(a)chromium.org> --- The duplicated code seems to exist since the beginning of buildman. tools/buildman/builderthread.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index c512d3b..16e87f3 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -304,10 +304,6 @@ class BuilderThread(threading.Thread): print >>fd, 'arch', result.toolchain.arch fd.write('%s' % result.return_code) - with open(os.path.join(build_dir, 'toolchain'), 'w') as fd: - print >>fd, 'gcc', result.toolchain.gcc - print >>fd, 'path', result.toolchain.path - # Write out the image and function size information and an objdump env = result.toolchain.MakeEnvironment(self.builder.full_path) lines = [] -- 2.7.4

2 3

[U-Boot] [RFC] Rearrange CONFIG_* macros
by york sun 03 Oct '16

03 Oct '16

Guys, I want to discuss to rearrange the current CONFIG_* macros used by Freescale Layerscape SoCs. We have been encouraged to use CONFIG_SYS_* macros to define hardware setting, and other CONFIG_* macros for user setting. Clearly this has changed. Kconfig options are used for most user settings from now on. I am OK with it. But for existing CONFIG_SYS_* macros, we need a plan to either move them out of CONFIG_* name space, or move some to Kconfig, if that makes sense. Since most our CONFIG_SYS_* macros are cross platforms (including armv7 and armv8), if using Kconfig option, do we add another mach-fsl folder to host the Kconfig, or somewhere else? We also have macros cross ARM and PowerPC. So we either move them out of arch/, or duplicate them for both arch. If we move them to another name space, for example SYS_FSL_*, do we want to move them out of config.h? Any suggestion/comment? York

5 12

[U-Boot] [PATCH] serial: ns16550: Fix serial output on Tegra186
by Thierry Reding 03 Oct '16

03 Oct '16

From: Thierry Reding <treding(a)nvidia.com> For Tegra186 there are currently no UART clocks wired up in device tree. This exposes a regression introduced in commit 50fce1d5d874 ("serial: ns16550: Support clocks via phandle"), which causes the p2771-0000-500 board (and probably any Tegra186-based board as well) to fail to boot. The reason is that if no clocks property exists, then clk_get_by_index() returns -ENOENT (via fdtdec_parse_phandle_with_args()) rather than -ENODEV as the above-mentioned commit expects. Fix this by checking for the right error code. Reported-by: Alexandre Courbot <acourbot(a)nvidia.com> Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- drivers/serial/ns16550.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 765499dab646..9c36dbe2a566 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -408,7 +408,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) err = clk_get_rate(&clk); if (!IS_ERR_VALUE(err)) plat->clock = err; - } else if (err != -ENODEV && err != -ENOSYS) { + } else if (err != -ENOENT && err != -ENOSYS) { debug("ns16550 failed to get clock\n"); return err; } -- 2.10.0

4 6

[U-Boot] [PATCH v4 00/10] Allow secure boot on AM33xx devices
by Andrew F. Davis 03 Oct '16

03 Oct '16

Hello all, I've recently been tasked with enabling authenticated boot for AM33xx based devices. This work is similar to what has already been done for the AM43xx and AM57xx SoCs and leverages much of the infrastructure from them. The big difference here is the size of SRAM available on AM33xx being much less than on the other SoCs, when performing a secure boot this limits the maximum size of the SPL to just ~41k, the SPL currently generated for AM33xx SoCs is ~70k. I have added a defconfig for booting from mmc, but it is RFC for now as the generated SPL is still much too large to fit into SRAM on HS devices. If you would like to help out you can build this defconfig and it will report by how much we have overflowed SRAM, any help reducing this would be greatly appreciated. Thanks, Andrew Changes from v3: - Drop SPL_*_BOOT patches as these do not get used by almost anyone so we can just work to remove them completly. - Fixed defaults for ISW_ENTRY_ADDR. Changes from v2: - Dropping the SPL_*_SUPPORT patches as Simon is already way ahead of me on this front[0]. - Minor re-organization of the patches, dropped a couple that I didn't feel were important enough to continue working right now. Changes from v1: - I've moved the cleanup patches to the end of the series and now consider them RFCs. I also do not move any Kconfig options over as this can be performed automatically but will need to be done by someone who understands the build system better than me. - Separate additional AM33xx SOC based boards out from the SoC definition in patch #1. [0] https://www.mail-archive.com/u-boot@lists.denx.de/msg222736.html Andrew F. Davis (10): Kconfig: Separate AM33XX SOC config from target board config am33xx: config.mk: Add support for additional secure boot image types doc: Update info on using AM33xx secure devices from TI am33xx: config.mk: Fix option used to enable SPI SPL image type board: am33xx-hs: Allow post-processing of FIT image on AM33xx ti: omap-common: Allow AM33xx devices to be built securely am335x: configs: Use ISW_ENTRY_ADDR to set SPL_TEXT_BASE config: Remove usage of CONFIG_STORAGE_EMMC ti_armv7_common: Disable Falcon Mode on HS devices defconfig: Add a config for AM335x High Security EVM with SD Boot support arch/arm/Kconfig | 98 +++------------------- arch/arm/cpu/armv7/am33xx/Kconfig | 89 +++++++++++++++++++- arch/arm/cpu/armv7/am33xx/config.mk | 24 +++++- arch/arm/cpu/armv7/omap-common/Kconfig | 2 +- board/ti/am335x/board.c | 8 ++ configs/am335x_baltos_defconfig | 1 + configs/am335x_boneblack_defconfig | 1 + configs/am335x_boneblack_vboot_defconfig | 1 + configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_norboot_defconfig | 1 + configs/am335x_evm_spiboot_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + ...x_evm_defconfig => am335x_hs_evm_mmc_defconfig} | 8 +- configs/am335x_igep0033_defconfig | 1 + configs/am335x_shc_defconfig | 1 + configs/am335x_shc_ict_defconfig | 1 + configs/am335x_shc_netboot_defconfig | 1 + configs/am335x_shc_prompt_defconfig | 1 + configs/am335x_shc_sdboot_defconfig | 1 + configs/am335x_shc_sdboot_prompt_defconfig | 1 + configs/am335x_sl50_defconfig | 1 + configs/birdland_bav335a_defconfig | 1 + configs/birdland_bav335b_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + configs/pepper_defconfig | 1 + doc/README.ti-secure | 32 +++++++ include/configs/am335x_evm.h | 2 - include/configs/am335x_shc.h | 2 - include/configs/am335x_sl50.h | 2 - include/configs/bav335x.h | 2 - include/configs/ti_am335x_common.h | 3 +- include/configs/ti_armv7_common.h | 15 ++-- 36 files changed, 201 insertions(+), 109 deletions(-) copy configs/{am335x_evm_defconfig => am335x_hs_evm_mmc_defconfig} (86%) -- 2.9.3

4 45

[U-Boot] [PATCH 0/5] Secure EMIF firewall and memory reservation on DRA7xx/AM57x devices
by Daniel Allred 03 Oct '16

03 Oct '16

These patches to add secure memory reservations and EMIF firewall config to SDRAM init code. The reservation and firewall config is done using PPA installed HAL APIs, so they are not common to all platforms (so they are put in omap5 path instead of omap-common). With these patches applied, a secure memory reservation can be specified with the following configs: CONFIG_TI_SECURE_EMIF_REGION_START - start location of region. If it is not specified, then the region will be placed at the end of the SDRAM. CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE - total size of complete region CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE - size (less than total) made secure using secure firewalls. The secured region begins at the start location (it comes first), and anything left over will be non-secure but still reserved from use by u-boot and the kernel The secure_emif_reserve() API will make use of the above configs to make a part of the SDRAM secure, with the lowest enforcing priority, giving access to the ARM TrustZone world only. The secure_emif_firewall_setup() API is also introduced. This API allows setting other EMIF firewall regions with particular permissions (for other cores, etc). The current code does not use this API, but it exists to help satisfy particular system requirements that users might need. After all the configuration is done, the secure_emif_firewall_lock() API should be called to make the previous two APIs stop working. This is important in order to prevent a later compromise of public supervisor code from being able to modify the EMIF firewalls. This API is in the code, so any use of the secure_emif_firewall_setup() API must be inserted before the lock API is called. Daniel Allred (5): ti: omap5: Add Kconfig options for secure EMIF reservations arm: omap5: secure API for EMIF memory reservations ARM: DRA7: Add secure emif setup calls ti_omap5_common: mark region of DRAM protected on HS parts ARM: omap5: add fdt secure dram reservation fixup arch/arm/cpu/armv7/omap-common/emif-common.c | 15 ++++ arch/arm/cpu/armv7/omap5/Kconfig | 26 ++++++ arch/arm/cpu/armv7/omap5/Makefile | 1 + arch/arm/cpu/armv7/omap5/fdt.c | 64 +++++++++++++- arch/arm/cpu/armv7/omap5/sec-fxns.c | 126 +++++++++++++++++++++++++++ arch/arm/include/asm/omap_sec_common.h | 24 +++++ include/configs/ti_omap5_common.h | 8 ++ 7 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap5/sec-fxns.c -- 2.7.4

4 24

[U-Boot] [PATCH] net, macb: fix misaligned cache operation warning
by Heiko Schocher 03 Oct '16

03 Oct '16

when using tftp on the smartweb board, it prints a lot of CACHE: Misaligned operation at range [23b2e000, 23b2e100] warnings ... fixed them. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- detected with automated build and testing with tbot, see a log here: http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/77/steps/shell… There are 2 checkpatch warnings in this patch, for example: CHECK: Alignment should match open parenthesis + invalidate_dcache_range(macb->rx_ring_dma, + ALIGN(macb->rx_ring_dma + MACB_RX_DMA_DESC_SIZE, But if I align this, it gets unreadable ... drivers/net/macb.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 921537f..79b56ff 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -251,33 +251,35 @@ int macb_miiphy_write(struct mii_dev *bus, int phy_adr, int devad, int reg, static inline void macb_invalidate_ring_desc(struct macb_device *macb, bool rx) { if (rx) - invalidate_dcache_range(macb->rx_ring_dma, macb->rx_ring_dma + - MACB_RX_DMA_DESC_SIZE); + invalidate_dcache_range(macb->rx_ring_dma, + ALIGN(macb->rx_ring_dma + MACB_RX_DMA_DESC_SIZE, + PKTALIGN)); else - invalidate_dcache_range(macb->tx_ring_dma, macb->tx_ring_dma + - MACB_TX_DMA_DESC_SIZE); + invalidate_dcache_range(macb->tx_ring_dma, + ALIGN(macb->tx_ring_dma + MACB_TX_DMA_DESC_SIZE, + PKTALIGN)); } static inline void macb_flush_ring_desc(struct macb_device *macb, bool rx) { if (rx) flush_dcache_range(macb->rx_ring_dma, macb->rx_ring_dma + - MACB_RX_DMA_DESC_SIZE); + ALIGN(MACB_RX_DMA_DESC_SIZE, PKTALIGN)); else flush_dcache_range(macb->tx_ring_dma, macb->tx_ring_dma + - MACB_TX_DMA_DESC_SIZE); + ALIGN(MACB_TX_DMA_DESC_SIZE, PKTALIGN)); } static inline void macb_flush_rx_buffer(struct macb_device *macb) { flush_dcache_range(macb->rx_buffer_dma, macb->rx_buffer_dma + - MACB_RX_BUFFER_SIZE); + ALIGN(MACB_RX_BUFFER_SIZE, PKTALIGN)); } static inline void macb_invalidate_rx_buffer(struct macb_device *macb) { invalidate_dcache_range(macb->rx_buffer_dma, macb->rx_buffer_dma + - MACB_RX_BUFFER_SIZE); + ALIGN(MACB_RX_BUFFER_SIZE, PKTALIGN)); } #if defined(CONFIG_CMD_NET) @@ -596,7 +598,7 @@ static int gmac_init_multi_queues(struct macb_device *macb) macb->dummy_desc->ctrl = TXBUF_USED; macb->dummy_desc->addr = 0; flush_dcache_range(macb->dummy_desc_dma, macb->dummy_desc_dma + - MACB_TX_DUMMY_DMA_DESC_SIZE); + ALIGN(MACB_TX_DUMMY_DMA_DESC_SIZE, PKTALIGN)); for (i = 1; i < num_queues; i++) gem_writel_queue_TBQP(macb, macb->dummy_desc_dma, i - 1); -- 2.5.5

2 1

[U-Boot] [PATCH 2/2] ti_armv7_keystone2: Update addr_mon variable
by Lokesh Vutla 03 Oct '16

03 Oct '16

As boot monitor contains a mkimage header, it can be loaded at any location. So, have a common addr_mon address across all keystone2 SoCs. And also making sure that boot monitor is installed early during default boot to avoid any overlapping with other images. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- - This is based on top of https://patchwork.ozlabs.org/patch/670426/ include/configs/k2e_evm.h | 1 - include/configs/k2g_evm.h | 6 ++---- include/configs/k2hk_evm.h | 1 - include/configs/k2l_evm.h | 1 - include/configs/ti_armv7_keystone2.h | 5 +++-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 7eaab87..8d6471a 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -18,7 +18,6 @@ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ "boot=ubi\0" \ - "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "name_fdt=keystone-k2e-evm.dtb\0" \ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index d73543f..a145445 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -24,7 +24,6 @@ "bootpart=0:2\0" \ "bootdir=/boot\0" \ "rd_spec=-\0" \ - "addr_mon=0x0c040000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "name_fdt=keystone-k2g-evm.dtb\0" \ @@ -44,9 +43,8 @@ #define CONFIG_BOOTCOMMAND \ "run envboot; " \ "run set_name_pmmc init_${boot} init_fw_rd_${boot} " \ - "get_pmmc_${boot} run_pmmc " \ - "get_fdt_${boot} get_mon_${boot} get_kern_${boot} " \ - "run_mon run_kern" + "get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon " \ + "get_fdt_${boot} get_kern_${boot} run_kern" #include <configs/ti_armv7_keystone2.h> diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 0256f0e..913d454 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -18,7 +18,6 @@ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ "boot=ubi\0" \ - "addr_mon=0x0c5f0000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0" \ "name_fdt=keystone-k2hk-evm.dtb\0" \ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 2322ab2..395e61c 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -18,7 +18,6 @@ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_FW_INITRAMFS_BOOT_ENV \ "boot=ubi\0" \ - "addr_mon=0x0c140000\0" \ "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs " \ "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,4096\0" \ "name_fdt=keystone-k2l-evm.dtb\0" \ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index c8df48a..c0c5d87 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -250,6 +250,7 @@ "addr_ubi=0x82000000\0" \ "addr_secdb_key=0xc000000\0" \ "name_kern=zImage\0" \ + "addr_mon=0x87000000\0" \ "run_mon=mon_install ${addr_mon}\0" \ "run_kern=bootz ${loadaddr} ${rd_spec} ${fdtaddr}\0" \ "init_net=run args_all args_net\0" \ @@ -294,8 +295,8 @@ #ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ - "run init_${boot} init_fw_rd_${boot} get_fdt_${boot} " \ - "get_mon_${boot} get_kern_${boot} run_mon run_kern" + "run init_${boot} get_mon_${boot} run_mon init_fw_rd_${boot} " \ + "get_fdt_${boot} get_kern_${boot} run_kern" #endif #define CONFIG_BOOTARGS \ -- 2.9.3

2 2