summaryrefslogtreecommitdiffstats
path: root/target/device/Atmel
diff options
context:
space:
mode:
Diffstat (limited to 'target/device/Atmel')
-rw-r--r--target/device/Atmel/Config.in2
-rw-r--r--target/device/Atmel/Makefile.in8
2 files changed, 6 insertions, 4 deletions
diff --git a/target/device/Atmel/Config.in b/target/device/Atmel/Config.in
index 9f6305b7d..d19234549 100644
--- a/target/device/Atmel/Config.in
+++ b/target/device/Atmel/Config.in
@@ -65,7 +65,7 @@ config BR2_BOARD_PATH
endmenu
-source "target/device/Atmel/u-boot/Config.in"
+# source "target/device/Atmel/u-boot/Config.in"
source "target/device/Atmel/DataFlashBoot/Config.in"
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index 44eec8928..b6ca1be1a 100644
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -54,6 +54,8 @@ DFB_BOARD_NAME:=$(BOARD_NAME)
#BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config
+U_BOOT_VERSION:=$(strip $(subst ",,$(BR2_UBOOT_VERSION)))
+#"))
# Update things in board specific makefiles
include target/device/Atmel/*/Makefile.in
@@ -63,9 +65,9 @@ include target/device/Atmel/*/Makefile.in
UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config
UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h
-ifeq ($(BR2_TARGET_UBOOT_AT91),y)
-include $(ATMEL_PATH)/u-boot/u-boot.mk
-endif
+#ifeq ($(BR2_TARGET_UBOOT_AT91),y)
+#include $(ATMEL_PATH)/u-boot/u-boot.mk
+#endif
ifeq ($(BR2_TARGET_DATAFLASHBOOT),y)
include $(ATMEL_PATH)/DataFlashBoot/DataflashBoot.mk