Tegra multi image support
Subsystems (4)
cover Tegra multi image support
This series adds multi image support to the Tegra arch. We can now build all TWO supported boards together in one go.
Lucas Stach (8):
images: correctly linebreak built images output
tegra: try harder inlining early startup functions
tegra: start maincomplex execution at correct offset
tegra: fix PBL build
tegra: mandate relocatable binary
tegra: don't force to choose between Tegra arches
tegra: ac100: delete custom Kconfig
tegra: switch to multi image
arch/arm/Kconfig | 4 ++- arch/arm/boards/Makefile | 1 + arch/arm/boards/toradex-colibri-t20-iris/Makefile | 2 ++ arch/arm/boards/toradex-colibri-t20-iris/entry.c | 36 +++++++++++++++++++ arch/arm/boards/toshiba-ac100/Kconfig | 7 ---- arch/arm/boards/toshiba-ac100/Makefile | 2 ++ arch/arm/boards/toshiba-ac100/entry.c | 36 +++++++++++++++++++ arch/arm/configs/tegra20_colibri_iris_defconfig | 24 ------------- arch/arm/configs/tegra_v7_defconfig | 27 ++++++++++++++ arch/arm/configs/toshiba_ac100_defconfig | 42 ---------------------- arch/arm/dts/Makefile | 5 +++ arch/arm/mach-tegra/Kconfig | 43 ++++++++--------------- arch/arm/mach-tegra/Makefile | 1 + arch/arm/mach-tegra/include/mach/lowlevel.h | 36 +++++++++++++++---- arch/arm/mach-tegra/include/mach/tegra20-pmc.h | 2 ++ arch/arm/mach-tegra/tegra_avp_init.c | 34 ++++-------------- arch/arm/mach-tegra/tegra_maincomplex_init.c | 12 +++---- images/Makefile | 3 +- images/Makefile.tegra | 14 ++++++++ 19 files changed, 185 insertions(+), 146 deletions(-) create mode 100644 arch/arm/boards/toradex-colibri-t20-iris/Makefile create mode 100644 arch/arm/boards/toradex-colibri-t20-iris/entry.c delete mode 100644 arch/arm/boards/toshiba-ac100/Kconfig create mode 100644 arch/arm/boards/toshiba-ac100/entry.c delete mode 100644 arch/arm/configs/tegra20_colibri_iris_defconfig create mode 100644 arch/arm/configs/tegra_v7_defconfig delete mode 100644 arch/arm/configs/toshiba_ac100_defconfig create mode 100644 images/Makefile.tegra
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/8 images: correctly linebreak built images output
--- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
images/Makefile +1 -1
@@ -120,7 +120,7 @@ targets += $(foreach m, $(image-y), $(FILE_$(m))) SECONDARY: $(addprefix $(obj)/,$(targets)) images: $(addprefix $(obj)/, $(image-y)) FORCE - @echo "images built:\n" $(patsubst %,%\\n,$(image-y)) + @echo -e "images built:\n" $(patsubst %,%\\n,$(image-y)) clean-files := *.pbl *.pblb *.pblx *.map start_*.imximg *.img barebox.z start_*.kwbimg \ start_*.kwbuartimg *.socfpgaimg
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/8] images: correctly linebreak built images output
Quoted 10 lines · Lucas Stach
Signed-off-by Lucas Stach <[email protected]>--- images/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)images/Makefile +0
-0
images/Makefile targets += $(foreach m, $(image-y), $(FILE_$(m))) · line 123
Quoted 5 lines
images/Makefile +1
-1@@ -120,7 +120,7 @@ targets += $(foreach m, $(image-y), $(FILE_$(m))) SECONDARY: $(addprefix $(obj)/,$(targets)) images: $(addprefix $(obj)/, $(image-y)) FORCE - @echo "images built:\n" $(patsubst %,%\\n,$(image-y)) + @echo -e "images built:\n" $(patsubst %,%\\n,$(image-y))
Gnagnagna
This was working on Debian because there a quite broken dash builtin for 'echo' was used. The dash echo builtin does its best to be incompatible with stanard echo behaviour: It interpretes control characters even if -e is not given. Instead of at least ignoring the -e option it echos '-e' to standard out.
I changed the above to:
@echo "images built:" @for i in $(image-y); do echo $$i; done
The next step would be to use the SHELL make variable to force to a known shell.
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/8 tegra: try harder inlining early startup functions
In reply to Lucas StachIt seems GCC 4.8 tries to be clever by not inlining some of those functions. This causes havok, as it's absolutely required to inline the early startup function, otherwise we may end up calling ARMv7 code on the ARMv4 AVP.
--- arch/arm/mach-tegra/include/mach/lowlevel.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
arch/arm/mach-tegra/include/mach/lowlevel.h +14 -7
@@ -40,7 +40,8 @@#define T20_ODMDATA_UARTID_SHIFT 15#define T20_ODMDATA_UARTID_MASK (7 << T20_ODMDATA_UARTID_SHIFT) -static inline u32 tegra_get_odmdata (void ) +static inline __attribute__((always_inline)) +u32 tegra_get_odmdata (void ) {u32 bctsize, bctptr, odmdata;
@@ -62,7 +63,8 @@ enum tegra_chiptype { TEGRA20 = 0, }; -static inline enum tegra_chiptype tegra_get_chiptype (void ) +static inline __attribute__((always_inline)) +enum tegra_chiptype tegra_get_chiptype (void ) {u32 hidrev;
@@ -76,7 +78,8 @@ static inline enum tegra_chiptype tegra_get_chiptype(void) } } -static inline int tegra_get_num_cores (void ) +static inline __attribute__((always_inline)) +int tegra_get_num_cores (void ) {switch (tegra_get_chiptype ()) {case TEGRA20 :
@@ -89,7 +92,8 @@ static inline int tegra_get_num_cores(void) }/* Runtime data */ -static inline int tegra_cpu_is_maincomplex (void ) +static inline __attribute__((always_inline)) +int tegra_cpu_is_maincomplex (void ) {u32 tag0;
@@ -98,7 +102,8 @@ static inline int tegra_cpu_is_maincomplex(void)return (tag0 &0xff ) ==0x55 ; } -static inline uint32_t tegra20_get_ramsize (void ) +static inline __attribute__((always_inline)) +uint32_t tegra20_get_ramsize (void ) {switch ((tegra_get_odmdata () &T20_ODMDATA_RAMSIZE_MASK ) >>T20_ODMDATA_RAMSIZE_SHIFT ) {
@@ -120,7 +125,8 @@ static long uart_id_to_base[] = { TEGRA_UARTE_BASE, }; -static inline long tegra20_get_debuguart_base (void ) +static inline __attribute__((always_inline)) +long tegra20_get_debuguart_base (void ) {u32 odmdata;int id;
@@ -146,7 +152,8 @@ static inline long tegra20_get_debuguart_base(void)#define CRC_OSC_CTRL_OSC_FREQ_SHIFT 30#define CRC_OSC_CTRL_OSC_FREQ_MASK (0x3 << CRC_OSC_CTRL_OSC_FREQ_SHIFT) -static inline unsigned int tegra_get_osc_clock (void ) +static inline unsigned __attribute__((always_inline)) +int tegra_get_osc_clock(void) {u32 osc_ctrl =readl (TEGRA_CLK_RESET_BASE +CRC_OSC_CTRL );
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/8 tegra: start maincomplex execution at correct offset
In reply to Lucas Stach--- arch/arm/mach-tegra/tegra_avp_init.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/mach-tegra/tegra_avp_init.c +3 -8
@@ -19,6 +19,7 @@#include <common.h> #include <asm/barebox-arm-head.h> +#include <asm/barebox-arm.h> #include <mach/lowlevel.h> #include <mach/tegra20-car.h> #include <mach/tegra20-pmc.h>
@@ -194,13 +195,6 @@ void barebox_arm_reset_vector(void)/* minimal initialization, OK for both ARMv4 and ARMv7 */ tegra_cpu_lowlevel_setup (); -/* -* If we are already running on the main CPU complex jump straight -* to the maincomplex entry point. -*/ -if (tegra_cpu_is_maincomplex ()) -tegra_maincomplex_entry (); -/* get the number of cores in the main CPU complex of the current SoC */ num_cores =tegra_get_num_cores ();if (!num_cores)
@@ -212,7 +206,8 @@ void barebox_arm_reset_vector(void)stop_maincomplex_clocks (num_cores);/* set start address for the main CPU complex processors */ -writel (barebox_arm_head,TEGRA_EXCEPTION_VECTORS_BASE +0x100 ); +writel (tegra_maincomplex_entry -get_runtime_offset (), +TEGRA_EXCEPTION_VECTORS_BASE +0x100 );/* bring up main CPU complex */ start_cpu0_clocks ();
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/8 tegra: fix PBL build
In reply to Lucas StachDrop useless BUG(), we are too early for them to be of any use. Make sure we build the AVP code as ARMv4 even in PBL case.
--- arch/arm/mach-tegra/Makefile | 1 + arch/arm/mach-tegra/tegra_avp_init.c | 4 ---- arch/arm/mach-tegra/tegra_maincomplex_init.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-)
arch/arm/mach-tegra/Makefile +1 -0
@@ -1,4 +1,5 @@ CFLAGS_tegra_avp_init.o := -mcpu=arm7tdmi -march=armv4t +CFLAGS_pbl-tegra_avp_init.o := -mcpu=arm7tdmi -march=armv4t lwl-y += tegra_avp_init.o lwl-y += tegra_maincomplex_init.o obj-y += tegra20.o
arch/arm/mach-tegra/tegra_avp_init.c +0 -4
@@ -109,8 +109,6 @@ static void init_pllx(void)return ; chiptype =tegra_get_chiptype (); -if (chiptype <0 ) -BUG (); osc_freq = (readl (TEGRA_CLK_RESET_BASE +CRC_OSC_CTRL ) &CRC_OSC_CTRL_OSC_FREQ_MASK ) >>CRC_OSC_CTRL_OSC_FREQ_SHIFT ;
@@ -197,8 +195,6 @@ void barebox_arm_reset_vector(void)/* get the number of cores in the main CPU complex of the current SoC */ num_cores =tegra_get_num_cores (); -if (!num_cores) -BUG ();/* bring down main CPU complex (this may be a warm boot) */ enable_maincomplex_powerrail ();
arch/arm/mach-tegra/tegra_maincomplex_init.c +1 -1
@@ -33,7 +33,7 @@ void tegra_maincomplex_entry(void)break ;default :/* If we don't know the chiptype, better bail out */ -BUG (); +unreachable (); }/*
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 5/8 tegra: mandate relocatable binary
In reply to Lucas StachAllows us to drop some silly code workaround.
--- arch/arm/Kconfig | 1 + arch/arm/mach-tegra/Kconfig | 8 ++++---- arch/arm/mach-tegra/tegra_maincomplex_init.c | 8 +------- 3 files changed, 6 insertions(+), 11 deletions(-)
arch/arm/Kconfig +1 -0
@@ -173,6 +173,7 @@ config ARCH_TEGRA select GPIO_TEGRA select OFDEVICE select OFTREE + select RELOCATABLE config ARCH_ZYNQ bool "Xilinx Zynq-based boards"
arch/arm/mach-tegra/Kconfig +4 -4
@@ -1,5 +1,9 @@ if ARCH_TEGRA +config ARCH_TEXT_BASE + hex + default 0x0 + choice prompt "Tegra processor type"
@@ -46,10 +50,6 @@ endchoice if ARCH_TEGRA_2x_SOC -config ARCH_TEXT_BASE - hex - default 0x00108000 - choice prompt "Tegra 20 Board Type"
arch/arm/mach-tegra/tegra_maincomplex_init.c +1 -7
@@ -36,11 +36,5 @@ void tegra_maincomplex_entry(void)unreachable (); } -/* -* The standard load address for Tegra systems is 0x10800 which means -* the barebox binary will always be below the malloc area for all -* reasonable malloc area sizes. We offset the RAM base address by 8MB -* to pretend barebox is in another bank. -*/ -barebox_arm_entry (rambase +SZ_8M , ramsize -SZ_8M ,0 ); +barebox_arm_entry (rambase, ramsize,0 ); }
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 6/8 tegra: don't force to choose between Tegra arches
In reply to Lucas StachThere is nothing technically preventing a single Tegra 20/30 image to be built. Don't force this split in Kconfig.
--- arch/arm/mach-tegra/Kconfig | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
arch/arm/mach-tegra/Kconfig +6 -13
@@ -5,15 +5,6 @@ config ARCH_TEXT_BASE default 0x0 choice - prompt "Tegra processor type" - -config ARCH_TEGRA_2x_SOC - bool "Tegra 20" - select PINCTRL_TEGRA20 - -endchoice - -choice prompt "Tegra debug UART" help This is the first serial console that gets activated by barebox.
@@ -48,18 +39,22 @@ endchoice # --------------------------------------------------------- -if ARCH_TEGRA_2x_SOC +config ARCH_TEGRA_2x_SOC + bool + select PINCTRL_TEGRA20 choice - prompt "Tegra 20 Board Type" + prompt "select Tegra Board" config MACH_TEGRA20_GENERIC bool "Generic DT based board" + select ARCH_TEGRA_2x_SOC help Say Y here if you are building for a generic DT based board. config MACH_TOSHIBA_AC100 bool "Toshiba AC100" + select ARCH_TEGRA_2x_SOC help Say Y here if you are using Toshiba AC100 smartbook.
@@ -71,8 +66,6 @@ endif #MACH_TEGRA20_GENERIC source arch/arm/boards/toshiba-ac100/Kconfig -endif #ARCH_TEGRA_2x_SOC - # --------------------------------------------------------- endif
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 7/8 tegra: ac100: delete custom Kconfig
In reply to Lucas StachNow that tegra arch is both DT only and forced relocatable there is nothing interesting left in here.
--- arch/arm/boards/toshiba-ac100/Kconfig | 7 ------- arch/arm/mach-tegra/Kconfig | 2 -- 2 files changed, 9 deletions(-) delete mode 100644 arch/arm/boards/toshiba-ac100/Kconfig
arch/arm/boards/toshiba-ac100/Kconfig deleted +0 -7
@@ -1,7 +0,0 @@ -if MACH_TOSHIBA_AC100 - -config ARCH_TEXT_BASE - hex - default 0x01000000 - -endif
arch/arm/mach-tegra/Kconfig +0 -2
@@ -64,8 +64,6 @@ if MACH_TEGRA20_GENERIC endif #MACH_TEGRA20_GENERIC -source arch/arm/boards/toshiba-ac100/Kconfig - # --------------------------------------------------------- endif
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 8/8 tegra: switch to multi image
In reply to Lucas StachTo keep things clean I removed all support for the old way to build images. There is now a single tegra_v7 defconfig which builds both supported Tegra boards as images.
The new image generation also paves the way for integration of the tegra-cbootimage tool to produce directly flashable images.
--- arch/arm/Kconfig | 3 +- arch/arm/boards/Makefile | 1 + arch/arm/boards/toradex-colibri-t20-iris/Makefile | 2 ++ arch/arm/boards/toradex-colibri-t20-iris/entry.c | 36 +++++++++++++++++++ arch/arm/boards/toshiba-ac100/Makefile | 2 ++ arch/arm/boards/toshiba-ac100/entry.c | 36 +++++++++++++++++++ arch/arm/configs/tegra20_colibri_iris_defconfig | 24 ------------- arch/arm/configs/tegra_v7_defconfig | 27 +++++++++++++++ arch/arm/configs/toshiba_ac100_defconfig | 42 ----------------------- arch/arm/dts/Makefile | 5 +++ arch/arm/mach-tegra/Kconfig | 20 ++++------- arch/arm/mach-tegra/include/mach/lowlevel.h | 15 ++++++++ arch/arm/mach-tegra/include/mach/tegra20-pmc.h | 2 ++ arch/arm/mach-tegra/tegra_avp_init.c | 19 +++------- arch/arm/mach-tegra/tegra_maincomplex_init.c | 4 ++- images/Makefile | 1 + images/Makefile.tegra | 14 ++++++++ 17 files changed, 157 insertions(+), 96 deletions(-) create mode 100644 arch/arm/boards/toradex-colibri-t20-iris/Makefile create mode 100644 arch/arm/boards/toradex-colibri-t20-iris/entry.c create mode 100644 arch/arm/boards/toshiba-ac100/entry.c delete mode 100644 arch/arm/configs/tegra20_colibri_iris_defconfig create mode 100644 arch/arm/configs/tegra_v7_defconfig delete mode 100644 arch/arm/configs/toshiba_ac100_defconfig create mode 100644 images/Makefile.tegra
arch/arm/Kconfig +2 -1
@@ -165,12 +165,13 @@ config ARCH_TEGRA bool "NVIDIA Tegra" select CPU_V7 select HAS_DEBUG_LL - select BUILTIN_DTB select COMMON_CLK select COMMON_CLK_OF_PROVIDER select CLKDEV_LOOKUP select GPIOLIB select GPIO_TEGRA + select HAVE_DEFAULT_ENVIRONMENT_NEW + select HAVE_PBL_MULTI_IMAGES select OFDEVICE select OFTREE select RELOCATABLE
arch/arm/boards/Makefile +1 -0
@@ -80,6 +80,7 @@ obj-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += terasic-sockit/ obj-$(CONFIG_MACH_TNY_A9260) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9G20) += tny-a926x/ +obj-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += toradex-colibri-t20-iris/ obj-$(CONFIG_MACH_TOSHIBA_AC100) += toshiba-ac100/ obj-$(CONFIG_MACH_TQMA53) += tqma53/ obj-$(CONFIG_MACH_TQMA6X) += tqma6x/
arch/arm/boards/toradex-colibri-t20-iris/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +CFLAGS_pbl-entry.o := -mcpu=arm7tdmi -march=armv4t +lwl-y += entry.o
arch/arm/boards/toradex-colibri-t20-iris/entry.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Copyright (C) 2013 Lucas Stach <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>. +*/ + +#include <common.h> +#include <sizes.h> +#include <asm/barebox-arm.h> +#include <asm/barebox-arm-head.h> +#include <mach/lowlevel.h> + +extern char __dtb_tegra20_colibri_iris_start[]; + +ENTRY_FUNCTION (start_toradex_colibri_t20_iris)(void ) +{ +uint32_t fdt; + +__barebox_arm_head (); + +tegra_cpu_lowlevel_setup (); + + fdt = (uint32_t )__dtb_tegra20_colibri_iris_start -get_runtime_offset (); + +tegra_avp_reset_vector (fdt); +}
arch/arm/boards/toshiba-ac100/Makefile +2 -0
@@ -1 +1,3 @@ +CFLAGS_pbl-entry.o := -mcpu=arm7tdmi -march=armv4t +lwl-y += entry.o obj-y += board.o
arch/arm/boards/toshiba-ac100/entry.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Copyright (C) 2013 Lucas Stach <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms and conditions of the GNU General Public License, +* version 2, as published by the Free Software Foundation. +* +* This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>. +*/ + +#include <common.h> +#include <sizes.h> +#include <asm/barebox-arm.h> +#include <asm/barebox-arm-head.h> +#include <mach/lowlevel.h> + +extern char __dtb_tegra20_paz00_start[]; + +ENTRY_FUNCTION (start_toshiba_ac100)(void ) +{ +uint32_t fdt; + +__barebox_arm_head (); + +tegra_cpu_lowlevel_setup (); + + fdt = (uint32_t )__dtb_tegra20_paz00_start -get_runtime_offset (); + +tegra_avp_reset_vector (fdt); +}
arch/arm/configs/tegra20_colibri_iris_defconfig deleted +0 -24
@@ -1,24 +0,0 @@ -CONFIG_BUILTIN_DTB_NAME="tegra20-colibri-iris" -CONFIG_ARCH_TEGRA=y -CONFIG_AEABI=y -CONFIG_CMD_ARM_MMUINFO=y -CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y -CONFIG_STACK_SIZE=0x10000 -CONFIG_MALLOC_SIZE=0x4000000 -CONFIG_LONGHELP=y -CONFIG_GLOB=y -CONFIG_GLOB_SORT=y -CONFIG_HUSH_FANCY_PROMPT=y -CONFIG_HUSH_GETOPT=y -CONFIG_CMDLINE_EDITING=y -CONFIG_AUTO_COMPLETE=y -CONFIG_CMD_EDIT=y -CONFIG_CMD_MEMINFO=y -CONFIG_CMD_IOMEM=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_RESET=y -CONFIG_CMD_OFTREE=y -CONFIG_CMD_TIMEOUT=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_CLK=y -CONFIG_DRIVER_SERIAL_NS16550=y
arch/arm/configs/tegra_v7_defconfig new file +27 -0
@@ -0,0 +1,27 @@ +CONFIG_ARCH_TEGRA=y +CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS=y +CONFIG_MACH_TOSHIBA_AC100=y +CONFIG_AEABI=y +CONFIG_CMD_ARM_MMUINFO=y +CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y +CONFIG_ARM_UNWIND=y +CONFIG_MMU=y +CONFIG_STACK_SIZE=0x10000 +CONFIG_MALLOC_SIZE=0x4000000 +CONFIG_LONGHELP=y +CONFIG_HUSH_FANCY_PROMPT=y +CONFIG_CMDLINE_EDITING=y +CONFIG_AUTO_COMPLETE=y +CONFIG_MENU=y +CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y +CONFIG_CMD_EDIT=y +CONFIG_CMD_EXPORT=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_IOMEM=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_RESET=y +CONFIG_CMD_OFTREE=y +CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_CLK=y +CONFIG_DRIVER_SERIAL_NS16550=y
arch/arm/configs/toshiba_ac100_defconfig deleted +0 -42
42 lines not on this page · raw message
arch/arm/dts/Makefile +5 -0
@@ -13,6 +13,9 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \ dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5_sockit.dtb \ socfpga_cyclone5_socrates.dtb +dtb-$(CONFIG_ARCH_TEGRA) += \ + tegra20-colibri-iris.dtb \ + tegra20-paz00.dtb BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_NAME)) obj-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o
@@ -25,6 +28,8 @@ pbl-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6q-phytec-pbab01.dtb.o pbl-$(CONFIG_MACH_REALQ7) += imx6q-dmo-realq7.dtb.o pbl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox.dtb.o pbl-$(CONFIG_MACH_GK802) += imx6q-gk802.dtb.o +pbl-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += tegra20-colibri-iris.dtb.o +pbl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o pbl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o pbl-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += socfpga_cyclone5_socrates.dtb.o pbl-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += socfpga_cyclone5_sockit.dtb.o
arch/arm/mach-tegra/Kconfig +7 -13
@@ -4,6 +4,9 @@ config ARCH_TEXT_BASE hex default 0x0 +config BOARDINFO + default "" + choice prompt "Tegra debug UART" help
@@ -43,26 +46,17 @@ config ARCH_TEGRA_2x_SOC bool select PINCTRL_TEGRA20 -choice - prompt "select Tegra Board" +menu "select Tegra boards to be built" -config MACH_TEGRA20_GENERIC - bool "Generic DT based board" +config MACH_TORADEX_COLIBRI_T20_IRIS + bool "Toradex Colibri T20 on Iris Carrier" select ARCH_TEGRA_2x_SOC - help - Say Y here if you are building for a generic DT based board. config MACH_TOSHIBA_AC100 bool "Toshiba AC100" select ARCH_TEGRA_2x_SOC - help - Say Y here if you are using Toshiba AC100 smartbook. - -endchoice - -if MACH_TEGRA20_GENERIC -endif #MACH_TEGRA20_GENERIC +endmenu # ---------------------------------------------------------
arch/arm/mach-tegra/include/mach/lowlevel.h +15 -0
@@ -172,5 +172,20 @@ int tegra_get_osc_clock(void) } } +static inline __attribute__((always_inline)) +void tegra_cpu_lowlevel_setup (void ) +{ +uint32_t r; + +/* set the cpu to SVC32 mode */ + __asm__ __volatile__("mrs %0, cpsr" :"=r" (r)); + r &= ~0x1f ; + r |=0xd3 ; + __asm__ __volatile__("msr cpsr, %0" : :"r" (r)); +} + +/* reset vector for the AVP, to be called from board reset vector */ +void tegra_avp_reset_vector (uint32_t boarddata); +/* reset vector for the main CPU complex */ void tegra_maincomplex_entry (void );
arch/arm/mach-tegra/include/mach/tegra20-pmc.h +2 -0
@@ -65,3 +65,5 @@#define PMC_PWRGATE_STATUS_VE (1 << 2)#define PMC_PWRGATE_STATUS_TD (1 << 1)#define PMC_PWRGATE_STATUS_CPU (1 << 0) + +#define PMC_SCRATCH (i) (0x050 + 0x4*i)
arch/arm/mach-tegra/tegra_avp_init.c +4 -15
@@ -24,17 +24,6 @@#include <mach/tegra20-car.h> #include <mach/tegra20-pmc.h> -static inline void tegra_cpu_lowlevel_setup (void ) -{ -uint32_t r; - -/* set the cpu to SVC32 mode */ - __asm__ __volatile__("mrs %0, cpsr" :"=r" (r)); - r &= ~0x1f ; - r |=0xd3 ; - __asm__ __volatile__("msr cpsr, %0" : :"r" (r)); -} -/* instruct the PMIC to enable the CPU power rail */ static void enable_maincomplex_powerrail (void ) {
@@ -186,13 +175,10 @@ static void maincomplex_powerup(void)writel (reg,TEGRA_PMC_BASE +PMC_REMOVE_CLAMPING_CMD ); } } -void barebox_arm_reset_vector (void ) +void tegra_avp_reset_vector (uint32_t boarddata) {int num_cores; -/* minimal initialization, OK for both ARMv4 and ARMv7 */ -tegra_cpu_lowlevel_setup (); -/* get the number of cores in the main CPU complex of the current SoC */ num_cores =tegra_get_num_cores ();
@@ -205,6 +191,9 @@ void barebox_arm_reset_vector(void)writel (tegra_maincomplex_entry -get_runtime_offset (),TEGRA_EXCEPTION_VECTORS_BASE +0x100 ); +/* put boarddata in scratch reg, for main CPU to fetch after startup */ +writel (boarddata,TEGRA_PMC_BASE +PMC_SCRATCH (10 )); +/* bring up main CPU complex */ start_cpu0_clocks ();maincomplex_powerup ();
arch/arm/mach-tegra/tegra_maincomplex_init.c +3 -1
@@ -19,6 +19,7 @@#include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> #include <mach/lowlevel.h> +#include <mach/tegra20-pmc.h> void tegra_maincomplex_entry (void ) {
@@ -36,5 +37,6 @@ void tegra_maincomplex_entry(void)unreachable (); } -barebox_arm_entry (rambase, ramsize,0 ); +barebox_arm_entry (rambase, ramsize, +readl (TEGRA_PMC_BASE +PMC_SCRATCH (10 ))); }
images/Makefile +1 -0
@@ -109,6 +109,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F)) include $(srctree)/images/Makefile.imx include $(srctree)/images/Makefile.mvebu include $(srctree)/images/Makefile.socfpga +include $(srctree)/images/Makefile.tegra targets += $(image-y) pbl.lds barebox.x barebox.z targets += $(patsubst %,%.pblx,$(pblx-y))
images/Makefile.tegra new file +14 -0
@@ -0,0 +1,14 @@ +# +# barebox image generation Makefile for Tegra images +# + +board = $(srctree)/arch/$(ARCH)/boards + +# ----------------------- Tegra20 based boards --------------------------- +pblx-$(CONFIG_MACH_TOSHIBA_AC100) += start_toshiba_ac100 +FILE_barebox-tegra20-toshiba-ac100.img = start_toshiba_ac100.pblx +image-$(CONFIG_MACH_TOSHIBA_AC100) += barebox-tegra20-toshiba-ac100.img + +pblx-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += start_toradex_colibri_t20_iris +FILE_barebox-tegra20-toradex-colibri-t20-iris.img = start_toradex_colibri_t20_iris.pblx +image-$(CONFIG_MACH_TORADEX_COLIBRI_T20_IRIS) += barebox-tegra20-toradex-colibri-t20-iris.img
Signature · 7 lines
1.8.3.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox