From 453dca995ee437b2f6fc3e0a6e4e2b4317346dae Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sat, 13 Oct 2007 18:30:28 +0000 Subject: Create Advanced Linux Configuration option/Remove experimental --- target/device/Atmel/Makefile.in | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'target/device/Atmel/Makefile.in') diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index dbc91d4fb..898e3985f 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -53,16 +53,15 @@ endif LINUX26_COPYTO:=/tftpboot ifeq ($(DEFAULT_KERNEL_HEADERS),2.6.22.1) -KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/linux/kernel-patches-$(DOWNLOAD_LINUX26_VERSION) +KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/linux/kernel-patches-$(LINUX26_VERSION) else # Patch during kernel header build ifeq ($(BR2_avr32),y) -KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-avr32/kernel-patches-$(DOWNLOAD_LINUX26_VERSION) +KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-avr32/kernel-patches-$(LINUX26_VERSION) endif # Patch during kernel build ifeq ($(BR2_arm),y) -#LINUX26_PATCH_DIR:=target/device/Atmel/arch-at91/kernel-patches-$(DOWNLOAD_LINUX26_VERSION) -KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-arm/kernel-patches-$(DOWNLOAD_LINUX26_VERSION) +KERNEL_HEADERS_PATCH_DIR:=target/device/Atmel/arch-arm/kernel-patches-$(LINUX26_VERSION) endif endif @@ -73,7 +72,7 @@ DFB_BOARD_NAME:=$(BOARD_NAME) BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config -LINUX26_KERNEL=$(BINARIES_DIR)/$(PROJECT)-linux-$(LINUX26_VERSION) +LINUX26_KERNEL=$(BINARIES_DIR)/$(PROJECT)-linux-$(LINUX26_VERSION)-$(DATE) # Update things in board specific makefiles include target/device/Atmel/*/Makefile.in @@ -99,19 +98,4 @@ ifeq ($(strip $(BR2_TARGET_AT91BOOTSTRAP)),y) include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk endif -atmel_status: - @echo PROJECT_BUILD_DIR=$(PROJECT_BUILD_DIR) - @echo BOARD_NAME=$(BOARD_NAME) - @echo BR2_BOARD_PATH=$(BR2_BOARD_PATH) - @echo BR2_MAJOR_MINOR=$(BR2_LINUX_MAJOR_VERSION)$(BR2_LINUX_MINOR_VERSION) - @echo MAJOR_MINOR=$(LINUX_MAJOR_VER)$(LINUX_MINOR_VER) - @echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION) - @echo LINUX_SOURCE=$(LINUX_SOURCE) - @echo TARGETS=$(TARGETS) - @echo LINUX26_HEADERS_PATCH_DIR=$(LINUX26_HEADERS_PATCH_DIR) - @echo LINUX26_BINLOC=$(LINUX26_BINLOC) - @echo LINUX26_FORMAT=$(LINUX26_FORMAT) - @echo LINUX26_KERNEL=$(LINUX26_KERNEL) - -#TARGETS+=atmel_status endif -- cgit v1.2.3