GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-17 12:41:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tegra30: Add generic Tegra30 build support

Browse source 
This patch adds basic Tegra30 (T30) build support - no specific
board is targeted.

Signed-off-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Tom Warren 2012-12-11 13:34:17 +00:00 • committed by Tom Warren
parent 79ce91bade
commit 6d6c0baebe
6 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -348,7 +348,7 @@ endif
ifeq ($(SOC),exynos) ifeq ($(SOC),exynos)
LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o LIBS-y += $(CPUDIR)/s5p-common/libs5p-common.o
endif endif
ifeq ($(SOC),tegra20) ifneq ($(CONFIG_TEGRA),)
LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o
LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o
@ -413,7 +413,7 @@ ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET))
ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
# enable combined SPL/u-boot/dtb rules for tegra # enable combined SPL/u-boot/dtb rules for tegra
ifeq ($(SOC),tegra20) ifneq ($(CONFIG_TEGRA),)
ifeq ($(CONFIG_OF_SEPARATE),y) ifeq ($(CONFIG_OF_SEPARATE),y)
ALL-y += $(obj)u-boot-dtb-tegra.bin ALL-y += $(obj)u-boot-dtb-tegra.bin
else else
@ -530,7 +530,7 @@ $(obj)u-boot.spr: $(obj)u-boot.img $(obj)spl/u-boot-spl.bin
conv=notrunc 2>/dev/null conv=notrunc 2>/dev/null
cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@ cat $(obj)spl/u-boot-spl-pad.img $(obj)u-boot.img > $@
ifeq ($(SOC),tegra20) ifneq ($(CONFIG_TEGRA),)
ifeq ($(CONFIG_OF_SEPARATE),y) ifeq ($(CONFIG_OF_SEPARATE),y)
nodtb=dtb nodtb=dtb
dtbfile=$(obj)u-boot.dtb dtbfile=$(obj)u-boot.dtb

2
arch/arm/cpu/armv7/Makefile
View file

@ -32,7 +32,7 @@ COBJS += cache_v7.o
COBJS += cpu.o COBJS += cpu.o
COBJS += syslib.o COBJS += syslib.o
ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA20),) ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA),)
SOBJS += lowlevel_init.o SOBJS += lowlevel_init.o
endif endif

4
arch/arm/cpu/armv7/start.S
View file

@ -251,12 +251,12 @@ ENTRY(c_runtime_cpu_setup)
/* /*
* Move vector table * Move vector table
*/ */
#if !defined(CONFIG_TEGRA20) #if !defined(CONFIG_TEGRA)
/* Set vector address in CP15 VBAR register */ /* Set vector address in CP15 VBAR register */
ldr r0, =_start ldr r0, =_start
add r0, r0, r9 add r0, r0, r9
mcr p15, 0, r0, c12, c0, 0 @Set VBAR mcr p15, 0, r0, c12, c0, 0 @Set VBAR
#endif /* !Tegra20 */ #endif /* !Tegra */
bx lr bx lr

17
board/nvidia/common/board.c
View file

@ -26,22 +26,30 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#ifdef CONFIG_LCD
#include <asm/arch/display.h> #include <asm/arch/display.h>
#include <asm/arch/emc.h> #endif
#include <asm/arch/funcmux.h> #include <asm/arch/funcmux.h>
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/pmu.h> #include <asm/arch/pmu.h>
#ifdef CONFIG_PWM_TEGRA
#include <asm/arch/pwm.h> #include <asm/arch/pwm.h>
#endif
#include <asm/arch/tegra.h> #include <asm/arch/tegra.h>
#include <asm/arch/usb.h>
#include <asm/arch-tegra/board.h> #include <asm/arch-tegra/board.h>
#include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/clk_rst.h>
#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/pmc.h>
#include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/sys_proto.h>
#include <asm/arch-tegra/uart.h> #include <asm/arch-tegra/uart.h>
#include <asm/arch-tegra/warmboot.h> #include <asm/arch-tegra/warmboot.h>
#include <spi.h> #ifdef CONFIG_TEGRA_CLOCK_SCALING
#include <asm/arch/emc.h>
#endif
#ifdef CONFIG_USB_EHCI_TEGRA
#include <asm/arch/usb.h>
#endif
#include <i2c.h> #include <i2c.h>
#include <spi.h>
#include "emc.h" #include "emc.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -188,6 +196,9 @@ void gpio_early_init(void) __attribute__((weak, alias("__gpio_early_init")));
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if defined(CONFIG_TEGRA30)
pinmux_init();
#endif
board_init_uart_f(); board_init_uart_f();
/* Initialize periph GPIOs */ /* Initialize periph GPIOs */

2
include/serial.h
View file

@ -32,7 +32,7 @@ extern struct serial_device *default_serial_console(void);
defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \ defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \
defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \ defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \
defined(CONFIG_TEGRA20) || defined(CONFIG_SYS_COREBOOT) || \ defined(CONFIG_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
defined(CONFIG_MICROBLAZE) defined(CONFIG_MICROBLAZE)
extern struct serial_device serial0_device; extern struct serial_device serial0_device;
extern struct serial_device serial1_device; extern struct serial_device serial1_device;

2
spl/Makefile
View file

@ -86,7 +86,7 @@ ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
LIBS-y += $(CPUDIR)/omap-common/libomap-common.o LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
endif endif
ifeq ($(SOC),tegra20) ifneq ($(CONFIG_TEGRA),)
LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o LIBS-y += arch/$(ARCH)/cpu/$(SOC)-common/lib$(SOC)-common.o
LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o LIBS-y += arch/$(ARCH)/cpu/tegra-common/libcputegra-common.o
LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o LIBS-y += $(CPUDIR)/tegra-common/libtegra-common.o