diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/kernel-defaults.mk | 6 | ||||
| -rw-r--r-- | include/kernel.mk | 2 | ||||
| -rw-r--r-- | include/target.mk | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index 9a4dd90ed..043b56865 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -94,6 +94,12 @@ define Kernel/Configure/Default $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target # copy CONFIG_KERNEL_* settings over to .config.target awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target +ifeq ($(CONFIG_TARGET_realtek),y) + echo "CONFIG_RTL_FLASH_SIZE=${CONFIG_REALTEK_FLASH_SIZE}" >> $(LINUX_DIR)/.config.target + echo "CONFIG_RTL_LINUX_IMAGE_OFFSET=0x${CONFIG_REALTEK_KERNEL_OFFSET}" >> $(LINUX_DIR)/.config.target + echo "CONFIG_RTL_ROOT_IMAGE_OFFSET=0x${CONFIG_REALTEK_ROOTFS_OFFSET}" >> $(LINUX_DIR)/.config.target + echo "CONFIG_RTL_KERNEL_LOAD_ADDRESS=${CONFIG_REALTEK_KERNEL_LOAD_ADDRESS}" >> $(LINUX_DIR)/.config.target +endif echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target diff --git a/include/kernel.mk b/include/kernel.mk index b637de591..fc0d3d349 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -66,7 +66,7 @@ ifneq (,$(findstring uml,$(BOARD))) LINUX_KARCH=um else ifeq (,$(LINUX_KARCH)) - LINUX_KARCH=$(strip $(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(ARCH)))))))))) + LINUX_KARCH=$(strip $(subst lexra,rlx,$(subst i386,x86,$(subst armeb,arm,$(subst mipsel,mips,$(subst mips64,mips,$(subst mips64el,mips,$(subst sh2,sh,$(subst sh3,sh,$(subst sh4,sh,$(ARCH))))))))))) endif endif diff --git a/include/target.mk b/include/target.mk index 6774076f9..9b2e2401a 100644 --- a/include/target.mk +++ b/include/target.mk @@ -107,7 +107,12 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),) include $(INCLUDE_DIR)/kernel-version.mk endif + GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic +ifeq ($(CONFIG_TARGET_realtek),y) +# stop any generic kernel patches being applied +GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/not-generic +endif GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") |