Allen,
On Tue, Dec 11, 2012 at 5:45 PM, Allen Martin amartin@nvidia.com wrote:
On Tue, Dec 11, 2012 at 03:34:15PM -0800, Tom Warren wrote:
These files are used by both SPL and main U-Boot. Also made minor changes to shared Tegra code to support T30 differences.
Signed-off-by: Tom Warren twarren@nvidia.com
V2:
- Differentiate between T20 and T30 in ODMDATA and query_sdram_size.
- Fix numerous func entries in pingroup table as per Stephen.
- Added warning about LOCK bit in pinmux_set_lock.
V3:
- Always program PLLP to 408MHz
- Use generic SoC string in print_cpuinfo
<snip>
bct_start = readl(AP20_BASE_PA_SRAM + NVBOOTINFOTABLE_BCTPTR);
bct_start = readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BCTPTR); odmdata = readl(bct_start + BCT_ODMDATA_OFFSET); return odmdata;@@ -127,5 +137,5 @@ void s_init(void) "orr r0, r0, #0x41\n" "mcr p15, 0, r0, c1, c0, 1\n");
/* FIXME: should have ap20's L2 disabled too? */
/* FIXME: should have SoC's L2 disabled too? */We should probably just remove this README, I don't believe it applies any more.
By README, you mean FIXME? It can be removed, but only if I'm forced to do a V4 patchset for more substantive changes. Otherwise I'll put it in my list of 'cleanup' items.
} diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/cpu/tegra-common/board.c index b2e10c6..af1879c 100644 --- a/arch/arm/cpu/tegra-common/board.c +++ b/arch/arm/cpu/tegra-common/board.c
<snip>
int dram_init(void) @@ -82,19 +103,27 @@ int checkboard(void) #endif /* CONFIG_DISPLAY_BOARDINFO */
static int uart_configs[] = { -#if defined(CONFIG_TEGRA_UARTA_UAA_UAB) +#if defined(CONFIG_TEGRA20)
- #if defined(CONFIG_TEGRA_UARTA_UAA_UAB) FUNCMUX_UART1_UAA_UAB,
-#elif defined(CONFIG_TEGRA_UARTA_GPU)
- #elif defined(CONFIG_TEGRA_UARTA_GPU) FUNCMUX_UART1_GPU,
-#elif defined(CONFIG_TEGRA_UARTA_SDIO1)
- #elif defined(CONFIG_TEGRA_UARTA_SDIO1) FUNCMUX_UART1_SDIO1,
-#else
- #else FUNCMUX_UART1_IRRX_IRTX,
-#endif
- #endif FUNCMUX_UART2_IRDA, -1, FUNCMUX_UART4_GMC, -1,
+#else /* Tegra30 */
FUNCMUX_UART1_ULPI, /* UARTA */-1,-1,-1,-1,Shouldn't there be entries for other UART selections here?
Right now, there are no other T30 boards in my possession with any other UARTs used for debug output. Stephen's soon-to-be-adopted ODMDATA/ODMDATA2 changes will hopefully remove the need for these tables.
<snip>
diff --git a/arch/arm/cpu/arm720t/tegra30/Makefile b/arch/arm/cpu/tegra30-common/Makefile similarity index 80% copy from arch/arm/cpu/arm720t/tegra30/Makefile copy to arch/arm/cpu/tegra30-common/Makefile index bd96997..75fef32 100644 --- a/arch/arm/cpu/arm720t/tegra30/Makefile +++ b/arch/arm/cpu/tegra30-common/Makefile @@ -19,12 +19,15 @@
include $(TOPDIR)/config.mk
-LIB = $(obj)lib$(SOC).o +# The AVP is ARMv4T architecture so we must use special compiler +# flags for any startup files it might use.
The SPL build should make this transparent to this Makefile.
I"ll remove the comment if I do a V4 patchset, otherwise it'll go in the 'cleanup' patchset.
Thanks,
Tom