Commit dff25ea2 authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Thomas Petazzoni
Browse files

linux: migrate to the kconfig infrastructure 



Migrate the linux package to the kconfig infrastructure.
A notable change compared to the original behavior:

- the targets linux-update-(def)config are now always saving the config
  file, even for a defconfig bundled in the linux sources. This is done
  to keep the kconfig infrastructure simple.

Signed-off-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatar"Yann E. Morin" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 89a47724

linux/linux.mk

+8 −28
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ LINUX_MAKE_FLAGS = \ 
	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \

	DEPMOD=$(HOST_DIR)/sbin/depmod



LINUX_MAKE_ENV = $(TARGET_MAKE_ENV)



# Get the real Linux version, which tells us where kernel modules are

# going to be installed in the target filesystem.

LINUX_VERSION_PROBED = $(shell $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease)
@@ -174,10 +176,11 @@ else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y) 
KERNEL_SOURCE_CONFIG = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE))

endif



define LINUX_CONFIGURE_CMDS

	$(INSTALL) -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig

	$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig

	rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig

LINUX_KCONFIG_FILE = $(KERNEL_SOURCE_CONFIG)

LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig

LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS)



define LINUX_KCONFIG_FIXUP_CMDS

	$(if $(BR2_arm)$(BR2_armeb),

		$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config))

	$(if $(BR2_TARGET_ROOTFS_CPIO),
@@ -222,7 +225,6 @@ define LINUX_CONFIGURE_CMDS 
		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config))

	$(if $(BR2_LINUX_KERNEL_APPENDED_DTB),

		$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB,$(@D)/.config))

	yes '' | $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) oldconfig

endef



ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
@@ -319,29 +321,7 @@ endef 


include $(sort $(wildcard linux/linux-ext-*.mk))



$(eval $(generic-package))



ifeq ($(BR2_LINUX_KERNEL),y)

linux-menuconfig linux-xconfig linux-gconfig linux-nconfig: linux-configure

	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \

		$(subst linux-,,$@)

	rm -f $(LINUX_DIR)/.stamp_{built,target_installed,images_installed}



linux-savedefconfig: linux-configure

	$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) \

		$(subst linux-,,$@)



ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)

linux-update-config: linux-configure $(LINUX_DIR)/.config

	cp -f $(LINUX_DIR)/.config $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)



linux-update-defconfig: linux-savedefconfig

	cp -f $(LINUX_DIR)/defconfig $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)

else

linux-update-config: ;

linux-update-defconfig: ;

endif

endif

$(eval $(kconfig-package))



# Support for rebuilding the kernel after the cpio archive has

# been generated in $(BINARIES_DIR)/rootfs.cpio.