[U-Boot] [PATCH V2] arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master
Seaboard changes have removed the need for common/board.o in the Makefile. Propagate this change to the other Tegra2 builds.
Signed-off-by: Tom Warren twarren@nvidia.com --- V2: Add more info to commit msg about use/source of change
board/nvidia/harmony/Makefile | 1 - board/nvidia/ventana/Makefile | 3 +-- include/configs/ventana.h | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/board/nvidia/harmony/Makefile b/board/nvidia/harmony/Makefile index f6599de..b6efa1c 100644 --- a/board/nvidia/harmony/Makefile +++ b/board/nvidia/harmony/Makefile @@ -31,7 +31,6 @@ endif LIB = $(obj)lib$(BOARD).o
COBJS := $(BOARD).o -COBJS += ../common/board.o
SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/nvidia/ventana/Makefile b/board/nvidia/ventana/Makefile index 9e5a87f..b4ab79a 100644 --- a/board/nvidia/ventana/Makefile +++ b/board/nvidia/ventana/Makefile @@ -30,8 +30,7 @@ endif
LIB = $(obj)lib$(BOARD).o
-COBJS += ../seaboard/seaboard.o -COBJS += ../common/board.o +COBJS = ../seaboard/seaboard.o
SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/include/configs/ventana.h b/include/configs/ventana.h index afd6ff6..acc9b43 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -52,4 +52,7 @@ #define CONFIG_EFI_PARTITION #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT + +/* Environment not stored */ +#define CONFIG_ENV_IS_NOWHERE #endif /* __CONFIG_H */
Tom Warren wrote at Tuesday, December 20, 2011 1:54 PM:
Seaboard changes have removed the need for common/board.o in the Makefile. Propagate this change to the other Tegra2 builds.
Signed-off-by: Tom Warren twarren@nvidia.com
Acked-by: Stephen Warren swarren@nvidia.com Tested-by: Stephen Warren swarren@nvidia.com
Dear Tom Warren,
In message 1324414465-7999-1-git-send-email-twarren@nvidia.com you wrote:
Seaboard changes have removed the need for common/board.o in the Makefile. Propagate this change to the other Tegra2 builds.
Signed-off-by: Tom Warren twarren@nvidia.com
V2: Add more info to commit msg about use/source of change
board/nvidia/harmony/Makefile | 1 - board/nvidia/ventana/Makefile | 3 +-- include/configs/ventana.h | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-)
This patch breaks building for the harmony board:
Configuring for harmony board... arch/arm/cpu/armv7/tegra2/libtegra2.o: In function `checkboard': /home/wd/git/u-boot/work/arch/arm/cpu/armv7/tegra2/board.c:70: undefined reference to `sysinfo' arch/arm/lib/libarm.o: In function `board_init_r': /home/wd/git/u-boot/work/arch/arm/lib/board.c:465: undefined reference to `board_init' arch/arm/lib/libarm.o:(.data+0x4): undefined reference to `board_early_init_f' arch/arm/lib/libarm.o:(.data+0x8): undefined reference to `timer_init'
Best regards,
Wolfgang Denk
participants (3)
-
Stephen Warren -
Tom Warren -
Wolfgang Denk