Commit 453dca99 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Create Advanced Linux Configuration option/Remove experimental

parent f53d9ece

target/Config.in

+30 −4
Original line number Diff line number Diff line
@@ -23,26 +23,52 @@ endmenu 
menu "Kernel"

choice

	prompt "Kernel type"

	default BR2_KERNEL_LINUX

	default BR2_KERNEL_LINUX_ADVANCED if BR2_TARGET_ATMEL

	default BR2_KERNEL_LINUX if !BR2_TARGET_ATMEL



config BR2_KERNEL_none

	bool "none"

	help

	  Do not build a kernel



config BR2_KERNEL_LINUX_ADVANCED

	bool "linux (Advanced configuration)"

	select BR2_PACKAGE_LINUX

	help

	  The Linux kernel - Advanced Configuration.

	  http://www.kernel.org/



	  Note: Requires kernel-headers >= 2.6.19 since the other

	        kernel headers are just that (headers) and not full

	        kernels. This is a feature.



config BR2_KERNEL_LINUX

	bool "linux"

	bool "linux (Same version as linux headers)"

	select BR2_PACKAGE_LINUX

	help

	  Linux kernel

	  The Linux kernel.

	  http://www.kernel.org/



	  Note: Requires kernel-headers >= 2.6.19 since the other

	        kernel headers are just that (headers) and not full

	        kernels. This is a feature.



config BR2_KERNEL_HURD

	bool "hurd"

	help

	  GNU/Hurd kernel

endchoice

if BR2_KERNEL_LINUX



config BR2_PACKAGE_LINUX

	bool

	default n



if BR2_PACKAGE_LINUX

source "target/linux/Config.in"

#source "target/linux/Config.in.experimental"

source "target/linux/Config.in.advanced"

endif



if BR2_KERNEL_HURD

source "target/hurd/Config.in"

endif

target/Makefile.in

+8 −5
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ include target/*/*.mk 
# We already did add the kernel target to TARGETS and now just pull in the rules

# to actually build this target.



#ifeq ($(strip $(subst ",,$(BR2_PACKAGE_LINUX_EXPERIMENTAL_CONFIG))),y)

ifeq ($(strip $(subst ",,$(BR2_KERNEL_LINUX))),y)

#"))

#include target/linux/Makefile.in

##include target/linux-experimental/Makefile.in

#else

include target/linux/Makefile.in

#endif

endif



ifeq ($(strip $(subst ",,$(BR2_KERNEL_LINUX_ADVANCED))),y)

#"))

include target/linux/Makefile.in.advanced

endif



include target/hurd/Makefile.in

target/device/Atmel/Makefile.in

+4 −20
Original line number Diff line number Diff line
@@ -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

target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig

+242 −182

File changed.

Preview size limit exceeded, changes collapsed.

target/linux-experimental/Makefile.in

deleted100644 → 0
+0 −318

File deleted.

Preview size limit exceeded, changes collapsed.