Bug#593340: linux-2.6: please add new Debian arch: powerpcspe
Here is version two of the patch including following changes:
- rebased against trunk
- removed initramfs-uimage-format
- reusing powerpc's config. All FB driver which are =y are switched to
=m
- "# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set" is gone
- the dtb package is gone. The kernel image includes _all_ .dtb files.
- drop the dependency on device-tree-compiler und use the in-kernel-tree
binary
diff --git a/debian/config/defines b/debian/config/defines
index c1d23d9..fe32363 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -13,6 +13,7 @@ arches:
mips
mipsel
powerpc
+ powerpcspe
s390
sh4
sparc
diff --git a/debian/config/powerpcspe/config b/debian/config/powerpcspe/config
new file mode 100644
index 0000000..89a35ba
--- /dev/null
+++ b/debian/config/powerpcspe/config
@@ -0,0 +1,60 @@
+CONFIG_PPC_85xx=y
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+CONFIG_SPE=y
+CONFIG_MPC8536_DS=y
+CONFIG_MPC85xx_DS=y
+# CONFIG_CPU_FREQ is not set
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_LEGACY=y
+CONFIG_MTD=y
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_PHYSMAP_OF=m
+CONFIG_SATA_FSL=m
+CONFIG_FSL_PQ_MDIO=m
+CONFIG_GIANFAR=m
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_BOOKE_WDT=y
+CONFIG_I2C_MPC=m
+CONFIG_SPI_MPC8xxx=m
+CONFIG_AGP=m
+# CONFIG_FB_OF is not set
+CONFIG_FB_FSL_DIU=m
+CONFIG_FB_CT65550=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_MATROX=m
+CONFIG_FB_MACMODES=m
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_SIS=m
+CONFIG_FB_VOODOO1=m
+# CONFIG_LOGO is not set
+CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_EDAC=y
+CONFIG_EDAC_MM_EDAC=y
+CONFIG_EDAC_MPC85XX=y
+CONFIG_USB=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+CONFIG_CRYPTO_DEV_TALITOS=m
+CONFIG_RCU_TORTURE_TEST=m
diff --git a/debian/config/powerpcspe/config.powerpcspe-smp b/debian/config/powerpcspe/config.powerpcspe-smp
new file mode 100644
index 0000000..7894f43
--- /dev/null
+++ b/debian/config/powerpcspe/config.powerpcspe-smp
@@ -0,0 +1,5 @@
+CONFIG_HIGHMEM=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_IRQ_ALL_CPUS=y
diff --git a/debian/config/powerpcspe/defines b/debian/config/powerpcspe/defines
new file mode 100644
index 0000000..48c3888
--- /dev/null
+++ b/debian/config/powerpcspe/defines
@@ -0,0 +1,34 @@
+[base]
+flavours:
+ powerpcspe
+ powerpcspe-smp
+kernel-arch: powerpc
+compiler: gcc-4.4
+
+[powerpcspe_base]
+class: Book-E Freescale
+longclass: Freescale's Book-E
+
+[powerpcspe_build]
+image-file: arch/powerpc/boot/uImage
+
+[powerpcspe_image]
+depends: uboot-mkimage
+configs: powerpc/config powerpcspe/config
+
+[powerpcspe_description]
+hardware: uniprocessor 32-bit FSL book-E PowerPC
+
+[powerpcspe-smp_base]
+class: Book-E Freescale
+longclass: Book-E with Freescale's changes
+
+[powerpcspe-smp_build]
+image-file: arch/powerpc/boot/uImage
+
+[powerpcspe-smp_image]
+depends: uboot-mkimage
+configs: powerpc/config powerpcspe/config powerpcspe/config.powerpcspe-smp
+
+[powerpcspe-smp_description]
+hardware: multiprocessor 32-bit FSL book-E PowerPC
diff --git a/debian/rules.real b/debian/rules.real
index a782735..91858ab 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -39,7 +39,7 @@ MAKE_PERF_VARS = prefix=/usr NO_PERL=1 V=2
#
binary-arch-arch: install-headers_$(ARCH)
binary-arch-arch: install-libc-dev_$(ARCH)
-ifneq ($(filter alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64,$(ARCH)),)
+ifneq ($(filter alpha amd64 armel hppa i386 powerpc powerpcspe s390 sh4 sparc sparc64,$(ARCH)),)
binary-arch-arch: install-tools_$(ARCH)
endif
binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
@@ -256,7 +256,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(
cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include} $(DIR)
cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s $(DIR)/arch/$(KERNEL_ARCH)/kernel
-ifeq ($(ARCH),powerpc)
+ifneq ($(filter powerpc powerpcspe,$(ARCH)),)
if [ -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o ]; then \
mkdir $(DIR)/arch/$(KERNEL_ARCH)/lib; \
cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o $(DIR)/arch/$(KERNEL_ARCH)/lib; \
@@ -386,6 +386,22 @@ install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_image \
install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_image: SOURCE_DIR=$(BUILD_DIR)/source
+install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_image: DTC_BIN=$(DIR)/scripts/dtc/dtc
+install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
+install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_image:
+ install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/uImage' $(INSTALL_DIR)/uImage-$(REAL_VERSION)
+ +$(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \
+ WRAPPER_OBJDIR='$(WRAPPER_INSTALL_DIR)' \
+ WRAPPER_DTSDIR='$(WRAPPER_INSTALL_DIR)'/dts \
+ WRAPPER_BINDIR='$(WRAPPER_INSTALL_DIR)'
+ mkdir -p $(PACKAGE_DIR)/boot/dtb
+ for name in $(wildcard $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/boot/dts/*.dts); do \
+ $(DTC_BIN) -O dtb -b 0 -p 1024 \
+ -o $(PACKAGE_DIR)/boot/dtb/$$(basename $$name .dts)-$(REAL_VERSION).dtb \
+ $$name; \
+ done
+
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image:
install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
@@ -407,6 +423,8 @@ install-image_mips_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_templates \
install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = vmlinux
+install-image_powerpcspe_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_KIMAGE = uImage
+
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates:
for i in $(wildcard debian/templates/temp.image.plain/*); do \
sed \
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index 62b6ab2..c4a6927 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -1,5 +1,5 @@
Package: linux-tools-@version@
-Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64
+Architecture: alpha amd64 armel hppa i386 powerpc powerpcspe s390 sh4 sparc sparc64
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: linux-base (>= 2.6.32-16)
Suggests: linux-doc-@version@
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index 377d3b4..0c1050f 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
Standards-Version: 3.8.4
-Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, binutils-dev, asciidoc, xmlto
+Build-Depends: debhelper (>> 7), cpio, module-init-tools, python, lzma [armel], libelf-dev, binutils-dev, asciidoc, xmlto, uboot-mkimage [powerpcspe]
Build-Depends-Indep: bzip2, python-support
Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/sid/linux-2.6/
Vcs-Browser: http://svn.debian.org/wsvn/kernel/dists/sid/linux-2.6/?op=log
Sebastian
Reply to: