summaryrefslogtreecommitdiffstats
path: root/target/device/Atmel
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-06-23 22:57:54 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-06-23 22:57:54 +0200
commit4aeb8c851ac1952908ec1b89e8e6e432d30c2dfd (patch)
tree8f45e0750646ae84c49bc426a6ac39d5a1a46fb3 /target/device/Atmel
parent6d34f1d3bfc22eb60d9bc9a1ff032dfd31945610 (diff)
downloadbuildroot-novena-4aeb8c851ac1952908ec1b89e8e6e432d30c2dfd.tar.gz
buildroot-novena-4aeb8c851ac1952908ec1b89e8e6e432d30c2dfd.zip
target/device: misc cleanup
Remove outdated and/or unused variables/files. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'target/device/Atmel')
-rw-r--r--target/device/Atmel/Config.in.linux.patches6
-rw-r--r--target/device/Atmel/Makefile.in54
-rw-r--r--target/device/Atmel/arch-arm/Config.in.linux.patches38
-rw-r--r--target/device/Atmel/arch-avr32/Config.in.linux.patches33
-rw-r--r--target/device/Atmel/arch-avr32/arch-avr32.mk24
5 files changed, 0 insertions, 155 deletions
diff --git a/target/device/Atmel/Config.in.linux.patches b/target/device/Atmel/Config.in.linux.patches
deleted file mode 100644
index 381277677..000000000
--- a/target/device/Atmel/Config.in.linux.patches
+++ /dev/null
@@ -1,6 +0,0 @@
-if BR2_arm
-source "target/device/Atmel/arch-arm/Config.in.linux.patches"
-endif
-if BR2_avr32
-source "target/device/Atmel/arch-avr32/Config.in.linux.patches"
-endif
diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in
index 38060aae4..5dacfdef6 100644
--- a/target/device/Atmel/Makefile.in
+++ b/target/device/Atmel/Makefile.in
@@ -14,61 +14,7 @@ ifeq ($(BR2_avr32),y)
KERNEL_HEADERS_PATCH_DIR=target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2
endif
-# These are set by Config.in
-DOWNLOAD_LINUX26_VERSION:= $(call qstrip,$(BR2_DOWNLOAD_LINUX26_VERSION))
-ifeq ($(DOWNLOAD_LINUX26_VERSION),)
-DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-endif
-
-LINUX26_VERSION:=$(call qstrip,$(BR2_LINUX26_VERSION))
-ifeq ($(LINUX26_VERSION),)
-LINUX26_VERSION=$(LINUX_HEADERS_VERSION)
-endif
-
-LINUX26_RC_PATCH:=$(call qstrip,$(BR2_LINUX26_RC_PATCH))
-
-# These are set by "new" Config.in
-LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config
-
-# This should be part of target/linux/Makefile.in
-LINUX26_BUILD_DIR:=$(BUILD_DIR)
-
-#LINUX26_BINLOC=$(LINUX26_FORMAT)
-#LINUX26_BINLOC:=$(BINARIES_DIR)/$(LINUX26_KERNEL)
-ifeq ($(BR2_avr32),y)
-LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/images/$(BR2_PACKAGE_LINUX_FORMAT)
-endif
-
-LINUX26_COPYTO:=/tftpboot
-
-#LINUX26_PATCH_DIR:=$(BOARD_PATH)/kernel-patches
-
-# The board specific Makefile.in can redefine BOARD_NAME's
-LINUX_BOARD_NAME:=$(BOARD_NAME)
-#UBOOT_BOARD_NAME:=$(BOARD_NAME)
-DFB_BOARD_NAME:=$(BOARD_NAME)
-
-#BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config
-
-U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION))
-
# Update things in board specific makefiles
include target/device/Atmel/*/Makefile.in
-# Needs to be AFTER board specific Makefiles
-
-UBOOT_CONFIG:=$(UBOOT_BOARD_NAME)_config
-UBOOT_CONFIG_FILE:=$(BOARD_PATH)/u-boot/$(UBOOT_BOARD_NAME).h
-
-atmel_status:
- @echo BUILD_DIR=$(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)
-
-#TARGETS+=atmel_status
endif
diff --git a/target/device/Atmel/arch-arm/Config.in.linux.patches b/target/device/Atmel/arch-arm/Config.in.linux.patches
deleted file mode 100644
index 8cd9a856a..000000000
--- a/target/device/Atmel/arch-arm/Config.in.linux.patches
+++ /dev/null
@@ -1,38 +0,0 @@
-choice
- prompt "Add AT91 specific patches"
- depends on BR2_KERNEL_ARCH_PATCH_ENABLED
- depends on BR2_TARGET_ATMEL && BR2_arm
- default BR2_ARCH_AT91_2_6_30 if BR2_LINUX_2_6_30
- default BR2_ARCH_AT91_2_6_28 if BR2_LINUX_2_6_28
- default BR2_ARCH_AT91_2_6_27 if BR2_LINUX_2_6_27
- help
- Select a patch to add to the Linux kernel
-
-config BR2_ARCH_AT91_2_6_30
- bool "2.6.30"
- help
- Apply the at91 linux-2.6.30 patches
-
-config BR2_ARCH_AT91_2_6_28
- bool "2.6.28"
- help
- Apply the at91 linux-2.6.28 patches
-
-config BR2_ARCH_AT91_2_6_27
- bool "2.6.27"
- help
- Apply the at91 linux-2.6.27 patches
-endchoice
-
-config BR2_KERNEL_ARCH_PATCH_VERSION
- string
- depends on BR2_KERNEL_ARCH_PATCH_ENABLED
- depends on BR2_TARGET_ATMEL && BR2_arm
- default "2.6.30" if BR2_ARCH_AT91_2_6_30
- default "2.6.28" if BR2_ARCH_AT91_2_6_28
- default "2.6.27" if BR2_ARCH_AT91_2_6_27
-
-config BR2_KERNEL_ARCH_PATCH_DIR
- string
- default "target/device/Atmel/arch-arm/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
-
diff --git a/target/device/Atmel/arch-avr32/Config.in.linux.patches b/target/device/Atmel/arch-avr32/Config.in.linux.patches
deleted file mode 100644
index b7867b139..000000000
--- a/target/device/Atmel/arch-avr32/Config.in.linux.patches
+++ /dev/null
@@ -1,33 +0,0 @@
-choice
- prompt "Add AVR32 specific patches"
- depends on BR2_KERNEL_ARCH_PATCH_ENABLED
- depends on BR2_avr32
- default BR2_ARCH_AVR32_2_6_27_6 if BR2_LINUX_2_6_27_6
- default BR2_ARCH_AVR32_2_6_28_2
- help
- Select a patch to add to the Linux kernel
-
-config BR2_ARCH_AVR32_2_6_28_2
- bool "2.6.28.2 (experimental)"
- help
- Apply the avr32 linux-2.6.28.2 patches
-
-config BR2_ARCH_AVR32_2_6_27_6
- bool "2.6.27.6"
- help
- Apply the avr32 linux-2.6.27.6 patches
-
-endchoice
-
-config BR2_KERNEL_ARCH_PATCH_VERSION
- string
- depends on BR2_KERNEL_ARCH_PATCH_ENABLED
- depends on BR2_avr32
- default "2.6.28.2" if BR2_ARCH_AVR32_2_6_28_2
- default "2.6.27.6" if BR2_ARCH_AVR32_2_6_27_6
-
-config BR2_KERNEL_ARCH_PATCH_DIR
- string
- default "target/device/Atmel/arch-avr32/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
-
-
diff --git a/target/device/Atmel/arch-avr32/arch-avr32.mk b/target/device/Atmel/arch-avr32/arch-avr32.mk
index 9fb888622..27a6d3bfe 100644
--- a/target/device/Atmel/arch-avr32/arch-avr32.mk
+++ b/target/device/Atmel/arch-avr32/arch-avr32.mk
@@ -1,27 +1,3 @@
ifeq ($(BR2_avr32),y)
-avr32.patched.ac97: $(LINUX26_DIR)/.patched.ac97
- @echo avr32.patched.ac97
-
-avr32.patched.isi: $(LINUX26_DIR)/.patched.isi
- @echo avr32.patched.isi
-
-avr32.patched.psif: $(LINUX26_DIR)/.patched.psif
- @echo avr32.patched.psif
-
-
-$(LINUX26_DIR)/.patched.isi: $(LINUX26_DIR)/.patched.arch
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \
- linux-*-500-v4l-avr32-isi.patch.cond
- touch $@
-
-$(LINUX26_DIR)/.patched.ac97: $(LINUX26_DIR)/.patched.arch
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \
- linux-*-avr32-ac97-reset.patch.cond
- touch $@
-
-$(LINUX26_DIR)/.patched.psif: $(LINUX26_DIR)/.patched.arch
- toolchain/patch-kernel.sh $(LINUX26_DIR) $(BR2_KERNEL_ARCH_PATCH_DIR) \
- linux-*-avr32-psif-2.patch.cond
- touch $@
endif