From c5c7a7c32d552592ac49749e5c184c89bd50c098 Mon Sep 17 00:00:00 2001 From: Steve Kipisz Date: Thu, 18 Jul 2013 15:13:04 -0400 Subject: am335x_evm: Add support to boot from NOR. NOR requires that s_init be within the first 4KiB of the image so that we can perform the rest of the required pinmuxing to talk with the rest of NOR that we are found on. When NOR_BOOT is set we save our environment in NOR at 512KiB and a redundant copy at 768KiB. We avoid using SPL for this case and u-boot.bin is written directly to the start of NOR. We enclose the DMM-related parts of arch/arm/cpu/armv7/am33xx/emif4.c with TI81xx checks as at this time U-Boot does not discard unused sections in the main build and this code relies on functions specific to (and only provided in) ti81xx-related code. Cc: Albert ARIBAUD Signed-off-by: Steve Kipisz Signed-off-by: Tom Rini --- board/ti/am335x/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/ti/am335x/Makefile') diff --git a/board/ti/am335x/Makefile b/board/ti/am335x/Makefile index cb2b999025..3dbeedab1a 100644 --- a/board/ti/am335x/Makefile +++ b/board/ti/am335x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -ifdef CONFIG_SPL_BUILD +ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_NOR_BOOT),y) COBJS := mux.o endif -- cgit v1.2.3