NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Microblaze: build kernel with device tree"

Browse Source 
This is way too specific to microblaze-only. Remove this support to
introduce a more generic way to do support device tree kernels.

This reverts commit aaed42d156.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Maxime Ripard 2012-07-30 14:32:44 +02:00 committed by Thomas Petazzoni
parent db81841692
commit 942fc4c554
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linux/Config.in
View File

@ -125,14 +125,6 @@ config BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE
help help
Path to the kernel configuration file Path to the kernel configuration file
config BR2_LINUX_KERNEL_DTS_FILE
string "Device Tree dts file location"
depends on BR2_microblaze
help
Path from where the dts file has to be copied
The final "custom target" name depends on the
dts file name:
<name>.dts --> simpleImage.<name>
# #
# Binary format # Binary format
# #

14
linux/linux.mk
View File

@ -119,18 +119,6 @@ endef
LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES LINUX_POST_PATCH_HOOKS += LINUX_APPLY_PATCHES
ifeq ($(KERNEL_ARCH),microblaze)
# on microblaze, we always want mkimage
LINUX_DEPENDENCIES+=host-uboot-tools
define LINUX_COPY_DTS
if test -f "$(BR2_LINUX_KERNEL_DTS_FILE)" ; then \
cp $(BR2_LINUX_KERNEL_DTS_FILE) $(@D)/arch/microblaze/boot/dts ; \
else \
echo "Cannot copy dts file!" ; \
fi
endef
endif
ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig KERNEL_SOURCE_CONFIG = $(KERNEL_ARCH_PATH)/configs/$(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
@ -145,8 +133,6 @@ define LINUX_CONFIGURE_CMDS
$(if $(BR2_ARM_EABI), $(if $(BR2_ARM_EABI),
$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config), $(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config)) $(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
$(if $(BR2_microblaze),
$(call LINUX_COPY_DTS))
# As the kernel gets compiled before root filesystems are # As the kernel gets compiled before root filesystems are
# built, we create a fake cpio file. It'll be # built, we create a fake cpio file. It'll be
# replaced later by the real cpio archive, and the kernel will be # replaced later by the real cpio archive, and the kernel will be