rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: David Marlin <dmarlin@redhat.com> 

Modify to split the ARM config files to work more like other archs.

Rename:
  config-arm -> config-arm-generic
Add:
  config-arm-omap-generic
This commit is contained in:
Josh Boyer 2011-07-01 15:33:00 -05:00
parent 1c75faa7b2
commit 408089c858
4 changed files with 1111 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.config
View File

@ -8,7 +8,8 @@ CONFIGFILES = \
$(CFG)-i686.config $(CFG)-i686-debug.config \
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config $(CFG)-arm.config \
$(CFG)-s390x.config \
$(CFG)-arm.config $(CFG)-armv7l-omap.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config \
$(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
@ -32,6 +33,12 @@ temp-generic: config-generic
temp-debug-generic: config-generic
cat config-generic config-debug > temp-debug-generic
temp-arm-generic: config-arm-generic temp-generic
perl merge.pl $^ > $@
temp-armv7l-omap-generic: config-arm-omap-generic temp-arm-generic
perl merge.pl $^ > $@
temp-x86-generic: config-x86-generic temp-generic
perl merge.pl $^ > $@
@ -92,7 +99,10 @@ kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generi
kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
perl merge.pl $^ s390 > $@
kernel-$(VERSION)-arm.config: config-arm temp-generic
kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
perl merge.pl $^ arm > $@
kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap-generic
perl merge.pl $^ arm > $@
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic

2
config-arm → config-arm-generic
View File

@ -146,4 +146,6 @@ CONFIG_USE_OF=y
CONFIG_PROC_DEVICETREE=y
CONFIG_MTD_PHYSMAP_OF=m
CONFIG_SERIAL_OF_PLATFORM=m
# CONFIG_LEDS_GPIO_OF is not set
CONFIG_MMC_SDHCI_OF=m

1090
config-arm-omap-generic Normal file
View File

File diff suppressed because it is too large Load Diff

9
kernel.spec
View File

@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
%global baserelease 2
%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -373,6 +373,7 @@ Summary: The Linux kernel
%ifarch %{arm}
%define all_arch_configs kernel-%{version}-arm*.config
%define image_install_path boot
%define asmarch arm
%define hdrarch arm
%define make_target vmlinux
%define kernel_image vmlinux
@ -549,7 +550,8 @@ Source70: config-s390x
Source90: config-sparc64-generic
Source100: config-arm
Source100: config-arm-generic
Source110: config-arm-omap-generic
# This file is intentionally left empty in the stock kernel. Its a nicety
# added for those wanting to do custom rebuilds with altered config opts.
@ -1825,6 +1827,9 @@ fi
# and build.
%changelog
* Tue Aug 09 2011 Josh Boyer <jwboyer@redhat.com>
- Add Makefile.config and ARM config changes from David Marlin
* Tue Aug 09 2011 Dave Jones <davej@redhat.com>
- ptrace_report_syscall: check if TIF_SYSCALL_EMU is defined