ARM: OMAP4/5: Add support to boot with device tree as default
cover ARM: OMAP4/5: Add support to boot with device tree as default
With the kernel moving all towards device tree, this series adds support to make the device tree boot as the default for OMAP4/5 platforms.
Sricharan R (5):
ARM: OMAP5: Rename omap5_evm.h to omap5_uevm.h
ARM: OMAP5: Set fdt_high to enable booting with Device tree
ARM: OMAP5: Support loading environment variables from txt file
ARM: OMAP4/5: Change the default boot command to work with device
tree
ARM: OMAP4/5: Make bootz as the default boot command
board/ti/omap5_evm/Makefile | 49 ------- board/ti/omap5_evm/evm.c | 101 ------------- board/ti/omap5_evm/mux_data.h | 304 ---------------------------------------- board/ti/omap5_uevm/Makefile | 49 +++++++ board/ti/omap5_uevm/evm.c | 101 +++++++++++++ board/ti/omap5_uevm/mux_data.h | 304 ++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/omap4_common.h | 16 ++- include/configs/omap5_common.h | 30 +++- include/configs/omap5_evm.h | 40 ------ include/configs/omap5_uevm.h | 40 ++++++ 11 files changed, 531 insertions(+), 505 deletions(-) delete mode 100644 board/ti/omap5_evm/Makefile delete mode 100644 board/ti/omap5_evm/evm.c delete mode 100644 board/ti/omap5_evm/mux_data.h create mode 100644 board/ti/omap5_uevm/Makefile create mode 100644 board/ti/omap5_uevm/evm.c create mode 100644 board/ti/omap5_uevm/mux_data.h delete mode 100644 include/configs/omap5_evm.h create mode 100644 include/configs/omap5_uevm.h
Signature · 1 line
1.7.9.5
PATCH 1/5 ARM: OMAP5: Rename omap5_evm.h to omap5_uevm.h
The omap5-uevm is the reference board name for OMAP5 soc based platform. So rename it accordingly.
--- board/ti/omap5_evm/Makefile | 49 ------- board/ti/omap5_evm/evm.c | 101 ------------- board/ti/omap5_evm/mux_data.h | 304 ---------------------------------------- board/ti/omap5_uevm/Makefile | 49 +++++++ board/ti/omap5_uevm/evm.c | 101 +++++++++++++ board/ti/omap5_uevm/mux_data.h | 304 ++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/omap5_evm.h | 40 ------ include/configs/omap5_uevm.h | 40 ++++++ 9 files changed, 495 insertions(+), 495 deletions(-) delete mode 100644 board/ti/omap5_evm/Makefile delete mode 100644 board/ti/omap5_evm/evm.c delete mode 100644 board/ti/omap5_evm/mux_data.h create mode 100644 board/ti/omap5_uevm/Makefile create mode 100644 board/ti/omap5_uevm/evm.c create mode 100644 board/ti/omap5_uevm/mux_data.h delete mode 100644 include/configs/omap5_evm.h create mode 100644 include/configs/omap5_uevm.h
board/ti/omap5_evm/Makefile deleted +0 -49
@@ -1,49 +0,0 @@ -# -# (C) Copyright 2000, 2001, 2002 -# Wolfgang Denk, DENX Software Engineering, wd at denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).o - -COBJS := evm.o - -SRCS := $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -clean: - rm -f $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -#########################################################################
board/ti/omap5_evm/evm.c deleted +0 -101
101 lines not on this page · raw message
board/ti/omap5_evm/mux_data.h deleted +0 -304
304 lines not on this page · raw message
board/ti/omap5_uevm/Makefile new file +49 -0
49 lines not on this page · raw message
board/ti/omap5_uevm/evm.c new file +101 -0
101 lines not on this page · raw message
board/ti/omap5_uevm/mux_data.h new file +304 -0
304 lines not on this page · raw message
boards.cfg +1 -1
@@ -291,7 +291,7 @@ twister arm armv7 twister technex nokia_rx51 arm armv7 rx51 nokia omap3 omap4_panda arm armv7 panda ti omap4 omap4_sdp4430 arm armv7 sdp4430 ti omap4 -omap5_evm arm armv7 omap5_evm ti omap5 +omap5_uevm arm armv7 omap5_uevm ti omap5 dra7xx_evm arm armv7 dra7xx ti omap5 s5p_goni arm armv7 goni samsung s5pc1xx smdkc100 arm armv7 smdkc100 samsung s5pc1xx
include/configs/omap5_evm.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* -* (C) Copyright 2013 -* Texas Instruments Incorporated. -* Sricharan R <[email protected]> -* -* Configuration settings for the TI EVM5430 board. -* See omap5_common.h for omap5 common settings. -* -* See file CREDITS for list of people who contributed to this -* project. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation; either version 2 of -* the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, -* MA 02111-1307 USA -*/ - -#ifndef __CONFIG_OMAP5_EVM_H -#define __CONFIG_OMAP5_EVM_H - -#include <configs/omap5_common.h> - -/* TWL6035 */ -#ifndef CONFIG_SPL_BUILD -#define CONFIG_TWL6035_POWER -#endif - -#define CONFIG_SYS_PROMPT "OMAP5430 EVM # " - -#endif /* __CONFIG_OMAP5_EVM_H */
include/configs/omap5_uevm.h new file +40 -0
@@ -0,0 +1,40 @@ +/* +* (C) Copyright 2013 +* Texas Instruments Incorporated. +* Sricharan R <[email protected]> +* +* Configuration settings for the TI EVM5430 board. +* See omap5_common.h for omap5 common settings. +* +* See file CREDITS for list of people who contributed to this +* project. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place, Suite 330, Boston, +* MA 02111-1307 USA +*/ + +#ifndef __CONFIG_OMAP5_EVM_H +#define __CONFIG_OMAP5_EVM_H + +#include <configs/omap5_common.h> + +/* TWL6035 */ +#ifndef CONFIG_SPL_BUILD +#define CONFIG_TWL6035_POWER +#endif + +#define CONFIG_SYS_PROMPT "OMAP5430 EVM # " + +#endif /* __CONFIG_OMAP5_EVM_H */
Signature · 1 line
1.7.9.5
PATCH 1/5 ARM: OMAP5: Rename omap5_evm.h to omap5_uevm.h
Quoted 15 lines · Sricharan R
The omap5-uevm is the reference board name for OMAP5 soc based platform. So rename it accordingly.
Signed-off-by Sricharan R <[email protected]>--- board/ti/omap5_evm/Makefile | 49 ------- board/ti/omap5_evm/evm.c | 101 ------------- board/ti/omap5_evm/mux_data.h | 304 ---------------------------------------- board/ti/omap5_uevm/Makefile | 49 +++++++ board/ti/omap5_uevm/evm.c | 101 +++++++++++++ board/ti/omap5_uevm/mux_data.h | 304 ++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/omap5_evm.h | 40 ------ include/configs/omap5_uevm.h | 40 ++++++ 9 files changed, 495 insertions(+), 495 deletions(-)
Quoted 8 lines
delete mode 100644 board/ti/omap5_evm/Makefile delete mode 100644 board/ti/omap5_evm/evm.c delete mode 100644 board/ti/omap5_evm/mux_data.h create mode 100644 board/ti/omap5_uevm/Makefile create mode 100644 board/ti/omap5_uevm/evm.c create mode 100644 board/ti/omap5_uevm/mux_data.h delete mode 100644 include/configs/omap5_evm.h create mode 100644 include/configs/omap5_uevm.h
Sorry, missed detecting renames while git format-patch. Will post V2 for that.
Regards,
Sricharan
PATCH 2/5 ARM: OMAP5: Set fdt_high to enable booting with Device tree
In reply to Sricharan RWhile booting with dt blob, if fdt_high is not set to 0xffffffff, the dt blob gets relocated to a high ram address, which the kernel is not able to use without HIGHMEM.
So set it to 0xffffffff to avoid the issue.
--- include/configs/omap5_common.h | 1 + 1 file changed, 1 insertion(+)
include/configs/omap5_common.h +1 -0
@@ -143,6 +143,7 @@#define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "console=ttyO2,115200n8\0" \ + "fdt_high=0xffffffff\0" \ "usbtty=cdc_acm\0" \ "vram=16M\0" \ "mmcdev=0\0" \
Signature · 1 line
1.7.9.5
PATCH 3/5 ARM: OMAP5: Support loading environment variables from txt file
In reply to Sricharan RThe boot.scr has to be built and copied, where as allowing to import the environment from a text file is much more friendly.
Thanks to the below patch, which has much more informative change log.
commit: d70f54808dfa83b574e1239c3eccbcf3317343e1
(omap4: allow the use of a plain text env file instead boot scripts)
--- include/configs/omap5_common.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
include/configs/omap5_common.h +13 -3
@@ -156,6 +156,9 @@"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \"source ${loadaddr}\0" \ +"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ +"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ +"env import -t ${loadaddr} ${filesize}\0" \"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc${mmcdev} ...; " \"run mmcargs; " \
@@ -166,9 +169,16 @@"if run loadbootscript; then " \"run bootscript; " \"else " \ -"if run loaduimage; then " \ -"run mmcboot; " \ -"fi; " \ +"if run loadbootenv; then " \ +"run importbootenv; " \ +"fi;" \ +"if test -n ${uenvcmd}; then " \ +"echo Running uenvcmd ...;" \ +"run uenvcmd;" \ +"fi;" \ +"fi;" \ +"if run loaduimage; then " \ +"run mmcboot; " \"fi; " \"fi"
Signature · 1 line
1.7.9.5
PATCH 4/5 ARM: OMAP4/5: Change the default boot command to work with device tree
In reply to Sricharan RNow with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board.
Thanks to Tom Rini <[email protected]> for suggesting this.
--- include/configs/omap4_common.h | 13 +++++++++++-- include/configs/omap5_common.h | 11 +++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-)
include/configs/omap4_common.h +11 -2
@@ -138,6 +138,7 @@*/ #define CONFIG_BOOTDELAY 3 +#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_OVERWRITE
@@ -145,6 +146,7 @@"loadaddr=0x82000000\0" \"console=ttyO2,115200n8\0" \"fdt_high=0xffffffff\0" \ +"fdtaddr=0x88000000\0" \"usbtty=cdc_acm\0" \"vram=16M\0" \"mmcdev=0\0" \
@@ -153,7 +155,9 @@"mmcargs=setenv bootargs console=${console} " \"vram=${vram} " \"root=${mmcroot} " \ -"rootfstype=${mmcrootfstype}\0" \ +"rootfstype=${mmcrootfstype}; " \ +"run findfdt; " \ +"fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \"source ${loadaddr}\0" \
@@ -163,7 +167,12 @@"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc${mmcdev} ...; " \"run mmcargs; " \ -"bootm ${loadaddr}\0" \ +"bootm ${loadaddr} - ${fdtaddr}\0" \ +"findfdt=" \ +"if test $board_name = omap4_sdp4430; then " \ +"setenv fdtfile omap4-sdp.dtb; fi; " \ +"if test $board_name = omap4_panda; then " \ +"setenv fdtfile omap4-panda.dtb; fi\0" \ #define CONFIG_BOOTCOMMAND \"mmc dev ${mmcdev}; if mmc rescan; then " \
include/configs/omap5_common.h +9 -2
@@ -137,6 +137,7 @@*/ #define CONFIG_BOOTDELAY 3 +#define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_ENV_OVERWRITE
@@ -144,6 +145,7 @@"loadaddr=0x82000000\0" \"console=ttyO2,115200n8\0" \"fdt_high=0xffffffff\0" \ +"fdtaddr=0x88000000\0" \"usbtty=cdc_acm\0" \"vram=16M\0" \"mmcdev=0\0" \
@@ -152,7 +154,9 @@"mmcargs=setenv bootargs console=${console} " \"vram=${vram} " \"root=${mmcroot} " \ -"rootfstype=${mmcrootfstype}\0" \ +"rootfstype=${mmcrootfstype}; " \ +"run findfdt; " \ +"fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \"source ${loadaddr}\0" \
@@ -162,7 +166,10 @@"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \"mmcboot=echo Booting from mmc${mmcdev} ...; " \"run mmcargs; " \ -"bootm ${loadaddr}\0" \ +"bootm ${loadaddr} - ${fdtaddr}\0" \ +"findfdt=" \ +"if test $board_name = omap5_uevm; then " \ +"setenv fdtfile omap5-uevm.dtb; fi;\0 " \ #define CONFIG_BOOTCOMMAND \"mmc dev ${mmcdev}; if mmc rescan; then " \
Signature · 1 line
1.7.9.5
PATCH 5/5 ARM: OMAP4/5: Make bootz as the default boot command
In reply to Sricharan RSo with OMAP added to multi platform kernel, the uImage no more contains a valid load address. With the uboot already supporting zImage, change the default boot command to bootz instead.
--- include/configs/omap4_common.h | 6 +++--- include/configs/omap5_common.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
include/configs/omap4_common.h +3 -3
@@ -164,10 +164,10 @@"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \"env import -t ${loadaddr} ${filesize}\0" \ -"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ +"loadzimage=fatload mmc ${mmcdev} ${loadaddr} zImage\0" \"mmcboot=echo Booting from mmc${mmcdev} ...; " \"run mmcargs; " \ -"bootm ${loadaddr} - ${fdtaddr}\0" \ +"bootz ${loadaddr} - ${fdtaddr}\0" \"findfdt=" \"if test $board_name = omap4_sdp4430; then " \"setenv fdtfile omap4-sdp.dtb; fi; " \
@@ -188,7 +188,7 @@"run uenvcmd;" \"fi;" \"fi;" \ -"if run loaduimage; then " \ +"if run loadzimage; then " \"run mmcboot; " \"fi; " \"fi"
include/configs/omap5_common.h +3 -3
@@ -163,10 +163,10 @@"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \"env import -t ${loadaddr} ${filesize}\0" \ -"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ +"loadzimage=fatload mmc ${mmcdev} ${loadaddr} zImage\0" \"mmcboot=echo Booting from mmc${mmcdev} ...; " \"run mmcargs; " \ -"bootm ${loadaddr} - ${fdtaddr}\0" \ +"bootz ${loadaddr} - ${fdtaddr}\0" \"findfdt=" \"if test $board_name = omap5_uevm; then " \"setenv fdtfile omap5-uevm.dtb; fi;\0 " \
@@ -184,7 +184,7 @@"run uenvcmd;" \"fi;" \"fi;" \ -"if run loaduimage; then " \ +"if run loadzimage; then " \"run mmcboot; " \"fi; " \"fi"
Signature · 1 line
1.7.9.5
cover ARM: OMAP4/5: Add support to boot with device tree as default
In reply to Sricharan RQuoted 24 lines · Sricharan R
With the kernel moving all towards device tree, this series adds support to make the device tree boot as the default for OMAP4/5 platforms.
Sricharan R (5):
ARM: OMAP5: Renameomap5_evm.htoomap5_uevm.h
ARM: OMAP5: Setfdt_highto enable booting with Device tree
ARM: OMAP5: Support loading environment variables from txt file
ARM: OMAP4/5: Change the default boot command to work with device
tree
ARM: OMAP4/5: Make bootz as the default boot commandboard/ti/omap5_evm/Makefile | 49 ------- board/ti/omap5_evm/evm.c | 101 ------------- board/ti/omap5_evm/mux_data.h | 304 ---------------------------------------- board/ti/omap5_uevm/Makefile | 49 +++++++ board/ti/omap5_uevm/evm.c | 101 +++++++++++++ board/ti/omap5_uevm/mux_data.h | 304 ++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/omap4_common.h | 16 ++- include/configs/omap5_common.h | 30 +++- include/configs/omap5_evm.h | 40 ------ include/configs/omap5_uevm.h | 40 ++++++ 11 files changed, 531 insertions(+), 505 deletions(-)
Quoted 9 lines
delete mode 100644 board/ti/omap5_evm/Makefile delete mode 100644 board/ti/omap5_evm/evm.c delete mode 100644 board/ti/omap5_evm/mux_data.h create mode 100644 board/ti/omap5_uevm/Makefile create mode 100644 board/ti/omap5_uevm/evm.c create mode 100644 board/ti/omap5_uevm/mux_data.h delete mode 100644 include/configs/omap5_evm.h create mode 100644 include/configs/omap5_uevm.h
Series:
{assuming change stated in http://patchwork.ozlabs.org/patch/230283/
Signature · 2 lines
Regards, Nishanth Menon
cover ARM: OMAP4/5: Add support to boot with device tree as default
Quoted 34 lines · Nishanth Menon
Quoted 24 lines · Sricharan R
With the kernel moving all towards device tree, this series adds support to make the device tree boot as the default for OMAP4/5 platforms.
Sricharan R (5):
ARM: OMAP5: Renameomap5_evm.htoomap5_uevm.h
ARM: OMAP5: Setfdt_highto enable booting with Device tree
ARM: OMAP5: Support loading environment variables from txt file
ARM: OMAP4/5: Change the default boot command to work with device
tree
ARM: OMAP4/5: Make bootz as the default boot commandboard/ti/omap5_evm/Makefile | 49 ------- board/ti/omap5_evm/evm.c | 101 ------------- board/ti/omap5_evm/mux_data.h | 304 ---------------------------------------- board/ti/omap5_uevm/Makefile | 49 +++++++ board/ti/omap5_uevm/evm.c | 101 +++++++++++++ board/ti/omap5_uevm/mux_data.h | 304 ++++++++++++++++++++++++++++++++++++++++ boards.cfg | 2 +- include/configs/omap4_common.h | 16 ++- include/configs/omap5_common.h | 30 +++- include/configs/omap5_evm.h | 40 ------ include/configs/omap5_uevm.h | 40 ++++++ 11 files changed, 531 insertions(+), 505 deletions(-)Quoted 9 lines
delete mode 100644 board/ti/omap5_evm/Makefile delete mode 100644 board/ti/omap5_evm/evm.c delete mode 100644 board/ti/omap5_evm/mux_data.h create mode 100644 board/ti/omap5_uevm/Makefile create mode 100644 board/ti/omap5_uevm/evm.c create mode 100644 board/ti/omap5_uevm/mux_data.h delete mode 100644 include/configs/omap5_evm.h create mode 100644 include/configs/omap5_uevm.h
Quoted 5 lines
Series:
Tested-by Nishanth Menon <[email protected]>{assuming change stated in http://patchwork.ozlabs.org/patch/230283/
Acked-by Nishanth Menon <[email protected]>
Thanks Nishanth.
Posting V3 to include your patch.
Regards,
Sricharan