Commit 3bab463b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

u-boot: clean up after Ulf 

As discussed on the list.
parent 6218173c

target/u-boot/Makefile.in

+1 −14
Original line number Diff line number Diff line
@@ -47,11 +47,7 @@ UBOOT_BOARD_NAME:=$(strip $(subst ",,$(BR2_TARGET_UBOOT_BOARDNAME))) 
#"))

endif



ifneq ($(BR2_TARGET_U_BOOT_CONFIG_BOARD),)

U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(subst _config,,$(BR2_TARGET_U_BOOT_CONFIG_BOARD)).h

else

U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h

endif



U_BOOT_TARGET_TOOLS:=

ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
@@ -99,13 +95,7 @@ ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH)),"") 
endif

	touch $@



$(U_BOOT_DIR)/.header_copied: $(U_BOOT_DIR)/.patched

ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)

	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)

endif

	touch $@



$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.header_copied

$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched

	$(TARGET_CONFIGURE_OPTS)		\

		CFLAGS="$(TARGET_CFLAGS)"	\

		LDFLAGS="$(TARGET_LDFLAGS)"	\
@@ -297,8 +287,6 @@ u-boot-status: 
	@echo

	@echo U_BOOT_INC_CONF_FILE = $(U_BOOT_INC_CONF_FILE)

	@echo BR2_UBOOT_VERSION = $(BR2_UBOOT_VERSION)

	@echo BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE = $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)

	@echo BR2_TARGET_U_BOOT_CONFIG_BOARD = $(BR2_TARGET_U_BOOT_CONFIG_BOARD)

	@echo BR2_TARGET_UBOOT_SERVERIP = $(BR2_TARGET_UBOOT_SERVERIP)

	@echo BR2_TARGET_UBOOT_IPADDR = $(BR2_TARGET_UBOOT_IPADDR)

	@echo BR2_TARGET_UBOOT_GATEWAY = $(BR2_TARGET_UBOOT_GATEWAY)
@@ -309,6 +297,5 @@ u-boot-status: 
	@echo BR2_TARGET_UBOOT_BOOTCMD = $(BR2_TARGET_UBOOT_BOOTCMD)

	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)

	@echo UBOOT_BOARD_NAME=$(UBOOT_BOARD_NAME)

	@echo TEST=$(TEST)

	@exit 0