Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!
| author | Michael Prokop <mika@grml.org> |
| Sun Jan 21 01:43:13 2007 +0100 (22 months ago) | |
| changeset 19 | e7ab3c80e9dd |
| manifest | e7ab3c80e9dd |
| parent 17 | eefe6bfc83a3 |
| child 20 | 2ab18afc389a |
--- a/2.6.19/ppc/notes.txt Fri Jan 19 00:38:36 2007 +0100+++ b/2.6.19/ppc/notes.txt Sun Jan 21 01:43:13 2007 +0100@@ -1,5 +1,65 @@-- 0009 (RTAS auf 32Bit) könnte auf 64 Bit PPC Ärger machen-- 0012 hmm den muss ich mir mal genauer ansehen-- 0018 könnte auch seiteneffekte haben+[formorer]-testcommit+- 0009 => (RTAS auf 32Bit) might cause problem ons 64 Bit PPC+- 0012 => take a close look at it+- 0018 => might have side-effects too++[mika]++- cross compiled the ppc kernel on x86, see+ http://michael-prokop.at/blog/2007/01/21/cross-compile-the-linux-kernel-on-debian/++- problems experienced with the kernel-build:++ - had to disable powermac platform because of problems in nvram :-/+ - had to disable FB_VGA16 because of problems in its code+ - drivers/char/drm/drm_sman.c:167: error: redefinition of '__kstrtab_drm_sman_set_manager'+ drivers/char/drm/drm_sman.c:165: error: previous definition of '__kstrtab_drm_sman_set_manager' was here+ -> problem is located in 0013-Add-EXPORT_SYMBOL-drm_sman_set_manager-to-allow-correct-module-link.txt, I+ did not apply the patch therefore+ - had to remove duplicate export of kd_mksound, adjusted arch/powerpc/kernel/ppc_ksyms.c:+ /*#ifdef CONFIG_VT+ EXPORT_SYMBOL(kd_mksound);+ #endif*/+ - deactivated CONFIG_SECCOMP (as suggested by gebi)++- applied the following patches for Linux grmlppc 2.6.19-grml #2 PREEMPT Sat Jan 20 20:26:15 CET 2007 ppc GNU/Linux:++ 1000_2.6.19.2.patch+ 4150_iteraid.patch+ 4300_squashfs-3.1.patch+ 4400_speakup-20061129.patch+ 5001_grml_logo.patch+ 5002_commandlinesize.patch+ oldworld-boot-fix.patch+ powerpc-mkvmlinuz-support-powerpc.patch+ powerpc-mkvmlinuz-support-ppc.patch+ 0001-Fix-compilation-issue-when-PPC_MPC52xx-and-PPC_MERGE-are-selected.txt+ 0002-Add-USB-OHCI-glue-for-OpenFirmware-devices.txt+ 0003-Add-MPC5200-serial-driver.txt+ 0004-Add-MPC5200-CPU-PIO-driver-using-libata.txt+ 0005-Add-MPC5200-specific-header.txt+ 0006-Add-MPC5200-interrupt-controller-driver.txt+ 0007-Add-MPC5200-ethernet-driver.txt+ 0008-Add-MPC5200-SDMA-PIO-driver.txt+ 0009-Added-RTAS-support-for-32bit-PowerPC.txt+ 0010-Add-Efika-platform.txt+ 0011-Filter-out-efika.txt+ 0012-Backport-of_platform.txt+ 0014-Added-mpc52xx_find_ipb_freq.txt+ 0015-Removed-mpc52xx_find_ipb_freq.txt+ 0016-Updated-to-latest-git-revision.txt+ 0017-Added-mpc52xx_common.c.txt+ 0018-Call-pci_read_irq_line-for-each-PCI-device-to-fix-the-IRQ.txt++- the vmlinuz image plus /usr/lib files were missing (not sure what's the reason, have to+ investigate on that), fixed manually by new Makefile:++% cat Makefile.new+IMAGE_POST_PROCESS_TARGET = mkvmlinuz_support_install+IMAGE_POST_PROCESS_DIR = arch/powerpc/boot+INSTALL_MKVMLINUZ_PATH = /usr/lib/linux-image-2.6.19-grml+TMPTOP = debian/linux-image-2.6.19-grml++all:+ make INSTALL_MKVMLINUZ=$(TMPTOP)$(INSTALL_MKVMLINUZ_PATH) ARCH=powerpc $(EXTRAV_ARG) $(CROSS_ARG) $(IMAGE_POST_PROCESS_TARGET);
--- a/config/config-2.6.19-grml-ppc Fri Jan 19 00:38:36 2007 +0100+++ b/config/config-2.6.19-grml-ppc Sun Jan 21 01:43:13 2007 +0100@@ -1,7 +1,7 @@## Automatically generated make config: don't edit-# Linux kernel version: 2.6.19-# Sat Dec 9 14:11:54 2006+# Linux kernel version: 2.6.19-grml+# Sat Jan 20 17:57:45 2007## CONFIG_PPC64 is not setCONFIG_PPC32=y@@ -132,7 +132,7 @@ CONFIG_PPC_MULTIPLATFORM=y# CONFIG_APUS is not setCONFIG_PPC_CHRP=yCONFIG_PPC_EFIKA=y-CONFIG_PPC_PMAC=y+# CONFIG_PPC_PMAC is not set# CONFIG_PPC_CELL is not set# CONFIG_PPC_CELL_NATIVE is not setCONFIG_UDBG_RTAS_CONSOLE=y@@ -154,8 +154,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y# CONFIG_CPU_FREQ_GOV_USERSPACE is not set# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set-CONFIG_CPU_FREQ_PMAC=y-# CONFIG_PPC601_SYNC_FIX is not setCONFIG_TAU=y# CONFIG_TAU_INT is not set# CONFIG_TAU_AVERAGE is not set@@ -199,7 +197,7 @@ CONFIG_PM_LEGACY=y# CONFIG_PM_SYSFS_DEPRECATED is not setCONFIG_SOFTWARE_SUSPEND=yCONFIG_PM_STD_PARTITION=""-CONFIG_SECCOMP=y+# CONFIG_SECCOMP is not setCONFIG_ISA_DMA_API=y#@@ -927,11 +925,7 @@ CONFIG_PARPORT_1284=y# Block devices#CONFIG_BLK_DEV_FD=y-CONFIG_MAC_FLOPPY=m-CONFIG_BLK_DEV_MPC52XX_ATAPIO=y-CONFIG_BLK_DEV_MPC52XX_ATAPIO_SDMA=y-CONFIG_BLK_DEV_MPC52XX_ATAPIO_MAXPIO=y-# CONFIG_BLK_DEV_MPC52XX_ATAPIO_VERBOSE is not set+# CONFIG_BLK_DEV_MPC52XX_ATAPIO is not setCONFIG_PARIDE=mCONFIG_PARIDE_PARPORT=m@@ -1049,9 +1043,6 @@ CONFIG_BLK_DEV_SLC90E66=yCONFIG_BLK_DEV_SLC90E66=yCONFIG_BLK_DEV_TRM290=yCONFIG_BLK_DEV_VIA82CXXX=y-CONFIG_BLK_DEV_IDE_PMAC=y-# CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST is not set-CONFIG_BLK_DEV_IDEDMA_PMAC=y# CONFIG_IDE_ARM is not setCONFIG_BLK_DEV_IDEDMA=yCONFIG_IDEDMA_IVB=y@@ -1160,10 +1151,6 @@ CONFIG_SCSI_DC390T=mCONFIG_SCSI_DC390T=mCONFIG_SCSI_NSP32=mCONFIG_SCSI_DEBUG=m-CONFIG_SCSI_MESH=m-CONFIG_SCSI_MESH_SYNC_RATE=5-CONFIG_SCSI_MESH_RESET_DELAY_MS=4000-CONFIG_SCSI_MAC53C94=m## PCMCIA SCSI adapter support@@ -1308,20 +1295,6 @@ CONFIG_I2O_PROC=m## Macintosh device drivers#-CONFIG_ADB=y-# CONFIG_ADB_CUDA is not set-CONFIG_ADB_PMU=y-CONFIG_ADB_PMU_LED=y-CONFIG_ADB_PMU_LED_IDE=y-CONFIG_PMAC_APM_EMU=m-CONFIG_PMAC_MEDIABAY=y-CONFIG_PMAC_BACKLIGHT=y-CONFIG_PMAC_BACKLIGHT_LEGACY=y-CONFIG_ADB_MACIO=y-CONFIG_INPUT_ADBHID=y-CONFIG_MAC_EMUMOUSEBTN=y-CONFIG_THERM_WINDTUNNEL=m-CONFIG_THERM_ADT746X=mCONFIG_WINDFARM=m#@@ -1372,9 +1345,6 @@ CONFIG_FIXED_PHY=m#CONFIG_NET_ETHERNET=yCONFIG_MII=y-CONFIG_MACE=m-# CONFIG_MACE_AAUI_PORT is not set-CONFIG_BMAC=mCONFIG_HAPPYMEAL=mCONFIG_SUNGEM=mCONFIG_CASSINI=m@@ -1519,7 +1489,6 @@ CONFIG_IPW2200_QOS=y# CONFIG_IPW2200_DEBUG is not setCONFIG_AIRO=mCONFIG_HERMES=m-CONFIG_APPLE_AIRPORT=mCONFIG_PLX_HERMES=mCONFIG_TMD_HERMES=mCONFIG_NORTEL_HERMES=m@@ -1957,7 +1926,6 @@ CONFIG_SERIAL_8250_RSA=y#CONFIG_SERIAL_CORE=yCONFIG_SERIAL_CORE_CONSOLE=y-CONFIG_SERIAL_PMACZILOG=mCONFIG_SERIAL_MPC52xx=yCONFIG_SERIAL_MPC52xx_CONSOLE=yCONFIG_SERIAL_MPC52xx_CONSOLE_BAUD=115200@@ -2019,7 +1987,6 @@ CONFIG_AGP=mCONFIG_AGP=mCONFIG_AGP_SIS=mCONFIG_AGP_VIA=m-CONFIG_AGP_UNINORTH=mCONFIG_DRM=mCONFIG_DRM_TDFX=mCONFIG_DRM_R128=m@@ -2071,7 +2038,6 @@ CONFIG_I2C_I810=mCONFIG_I2C_I810=mCONFIG_I2C_PIIX4=mCONFIG_I2C_ISA=m-CONFIG_I2C_POWERMAC=mCONFIG_I2C_MPC=mCONFIG_I2C_NFORCE2=mCONFIG_I2C_OCORES=m@@ -2445,28 +2411,23 @@ CONFIG_FB_CFB_COPYAREA=mCONFIG_FB_CFB_COPYAREA=mCONFIG_FB_CFB_IMAGEBLIT=mCONFIG_FB_MACMODES=m-CONFIG_FB_BACKLIGHT=y+# CONFIG_FB_BACKLIGHT is not setCONFIG_FB_MODE_HELPERS=yCONFIG_FB_TILEBLITTING=y# CONFIG_FB_CIRRUS is not set# CONFIG_FB_PM2 is not setCONFIG_FB_CYBER2000=m# CONFIG_FB_OF is not set-# CONFIG_FB_CONTROL is not set-# CONFIG_FB_PLATINUM is not set-# CONFIG_FB_VALKYRIE is not set# CONFIG_FB_CT65550 is not set# CONFIG_FB_ASILIANT is not set# CONFIG_FB_IMSTT is not set-CONFIG_FB_VGA16=m+# CONFIG_FB_VGA16 is not setCONFIG_FB_S1D13XXX=mCONFIG_FB_NVIDIA=mCONFIG_FB_NVIDIA_I2C=y-CONFIG_FB_NVIDIA_BACKLIGHT=yCONFIG_FB_RIVA=mCONFIG_FB_RIVA_I2C=y# CONFIG_FB_RIVA_DEBUG is not set-CONFIG_FB_RIVA_BACKLIGHT=yCONFIG_FB_MATROX=mCONFIG_FB_MATROX_MILLENIUM=yCONFIG_FB_MATROX_MYSTIQUE=y@@ -2476,15 +2437,12 @@ CONFIG_FB_MATROX_MULTIHEAD=yCONFIG_FB_MATROX_MULTIHEAD=yCONFIG_FB_RADEON=mCONFIG_FB_RADEON_I2C=y-CONFIG_FB_RADEON_BACKLIGHT=y# CONFIG_FB_RADEON_DEBUG is not setCONFIG_FB_ATY128=m-CONFIG_FB_ATY128_BACKLIGHT=yCONFIG_FB_ATY=mCONFIG_FB_ATY_CT=yCONFIG_FB_ATY_GENERIC_LCD=yCONFIG_FB_ATY_GX=y-CONFIG_FB_ATY_BACKLIGHT=yCONFIG_FB_SAVAGE=mCONFIG_FB_SAVAGE_I2C=y# CONFIG_FB_SAVAGE_ACCEL is not set@@ -2525,7 +2483,7 @@ CONFIG_FONT_10x18=y#CONFIG_LOGO=yCONFIG_LOGO_LINUX_MONO=y-CONFIG_LOGO_LINUX_VGA16=y+# CONFIG_LOGO_LINUX_VGA16 is not setCONFIG_LOGO_LINUX_CLUT224=yCONFIG_BACKLIGHT_LCD_SUPPORT=yCONFIG_BACKLIGHT_CLASS_DEVICE=y@@ -2561,8 +2519,6 @@ CONFIG_SPEAKUP_DEFAULT="none"# Sound#CONFIG_SOUND=m-CONFIG_DMASOUND_PMAC=m-CONFIG_DMASOUND=m## Advanced Linux Sound Architecture@@ -2668,19 +2624,6 @@ CONFIG_SND_AC97_POWER_SAVE=y## ALSA PowerMac devices#-CONFIG_SND_POWERMAC=m-CONFIG_SND_POWERMAC_AUTO_DRC=y--#-# Apple Onboard Audio driver-#-CONFIG_SND_AOA=m-CONFIG_SND_AOA_FABRIC_LAYOUT=m-CONFIG_SND_AOA_ONYX=m-CONFIG_SND_AOA_TAS=m-CONFIG_SND_AOA_TOONIE=m-CONFIG_SND_AOA_SOUNDBUS=m-CONFIG_SND_AOA_SOUNDBUS_I2S=m## USB devices@@ -3418,7 +3361,7 @@ CONFIG_SECURITY_ROOTPLUG=m#CONFIG_CRYPTO=yCONFIG_CRYPTO_ALGAPI=y-CONFIG_CRYPTO_BLKCIPHER=m+CONFIG_CRYPTO_BLKCIPHER=yCONFIG_CRYPTO_HASH=yCONFIG_CRYPTO_MANAGER=yCONFIG_CRYPTO_HMAC=y@@ -3431,7 +3374,7 @@ CONFIG_CRYPTO_WP512=mCONFIG_CRYPTO_WP512=mCONFIG_CRYPTO_TGR192=mCONFIG_CRYPTO_ECB=m-CONFIG_CRYPTO_CBC=m+CONFIG_CRYPTO_CBC=yCONFIG_CRYPTO_DES=mCONFIG_CRYPTO_BLOWFISH=mCONFIG_CRYPTO_TWOFISH=m
--- /dev/null Thu Jan 01 00:00:00 1970 +0000+++ b/2.6.19/ppc/oldworld-boot-fix.patch Sun Jan 21 01:43:13 2007 +0100@@ -0,0 +1,54 @@+# Patch author: Benjamin Herrenschmidt <benh@kernel.crashing.org>+# Description: Fix oldworld initrd loading problems.+# It looks like older OF "setprop" is bogus and isn't actually copying the+# data but just taking a pointer. The LongTrail workaround also has that+# problem as "property" will not copy the data. This fixes the workaround+# and applies it to Apple OF 1.0.5.+# Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>+# Closes:+# 375035: Kernel 2.6.16 attempts to access root device before running initramfs init+# 366620: initramfs-tools: 2.6.16-1-powerpc fails to mount rootfs, 2.6.15-1-powerpc works+#++Index: linux-tika/arch/powerpc/kernel/prom_init.c+===================================================================+--- linux-tika.orig/arch/powerpc/kernel/prom_init.c 2006-09-02 09:53:00.000000000 +1000++++ linux-tika/arch/powerpc/kernel/prom_init.c 2006-09-18 20:55:26.000000000 +1000+@@ -102,7 +102,7 @@+ #endif++ #define OF_WA_CLAIM 1 /* do phys/virt claim separately, then map */+-#define OF_WA_LONGTRAIL 2 /* work around longtrail bugs */++#define OF_WA_SETPROP 2 /* work around setprop bugs */++ #define PROM_BUG() do { \+ prom_printf("kernel BUG at %s line 0x%x!\n", \+@@ -472,7 +472,7 @@+ {+ char cmd[256], *p;++- if (!(OF_WORKAROUNDS & OF_WA_LONGTRAIL))++ if (!(OF_WORKAROUNDS & OF_WA_SETPROP))+ return call_prom("setprop", 4, 1, node, ADDR(pname),+ (u32)(unsigned long) value, (u32) valuelen);++@@ -482,6 +482,7 @@+ add_string(&p, nodename);+ add_string(&p, tohex((u32)(unsigned long) value));+ add_string(&p, tohex(valuelen));++ add_string(&p, "encode-bytes");+ add_string(&p, tohex(ADDR(pname)));+ add_string(&p, tohex(strlen(RELOC(pname))));+ add_string(&p, "property");+@@ -1466,9 +1467,9 @@+ version[sizeof(version) - 1] = 0;+ /* XXX might need to add other versions here */+ if (strcmp(version, "Open Firmware, 1.0.5") == 0)+- of_workarounds = OF_WA_CLAIM;++ of_workarounds = OF_WA_CLAIM | OF_WA_SETPROP;+ else if (strncmp(version, "FirmWorks,3.", 12) == 0) {+- of_workarounds = OF_WA_CLAIM | OF_WA_LONGTRAIL;++ of_workarounds = OF_WA_CLAIM | OF_WA_SETPROP;+ call_prom("interpret", 1, 1, "dev /memory 0 to allow-reclaim");+ } else+ return;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000+++ b/2.6.19/ppc/powerpc-mkvmlinuz-support-powerpc.patch Sun Jan 21 01:43:13 2007 +0100@@ -0,0 +1,52 @@+#+# Mkvmlinuz support patch, called by debian's kernel-package to generate+# the files needed by mkvmlinuz to generate the bootable images from vmlinux.+# Author: Sven Luther <luther@debian.org>+# Based on work from: Jens Schmalzing <jensen@debian.org>+# Original comment from Jens :+# This shell script is intended to be put into the debian subdirectory+# of a Linux kernel tree, where make-kpkg will find and execute it+# while building a kernel-image package. The purpose of this script+# is to add glue (object code, libraries, utilities and so on) from+# the kernel tree to the kernel-image package. Later, the mkvmlinuz+# utility, which is available as a separate Debian package, can use+# this glue to create a bootable compressed kernel from the+# uncompressed kernel in the kernel-image package and optionally a+# ramdisk. This is especially important on PowerPC subarchitectures+# that don't have a boot loader, but also comes handy for rescue+# systems and the like.+# Upstream status: This patch stays a debian specific patch for now,+# but it is not in a form where it could go upstream.+#+--- linux-2.6.19/arch/powerpc/Makefile.orig 2006-11-24 17:43:15.000000000 +0100++++ linux-2.6.19/arch/powerpc/Makefile 2006-11-24 17:44:32.000000000 +0100+@@ -148,7 +148,7 @@++ CPPFLAGS_vmlinux.lds := -Upowerpc++-BOOT_TARGETS = zImage zImage.initrd uImage++BOOT_TARGETS = zImage zImage.initrd uImage mkvmlinuz_support_install++ PHONY += $(BOOT_TARGETS)++--- linux-2.6.19/arch/powerpc/boot/Makefile.orig 2006-12-05 16:14:42.000000000 +0000++++ linux-2.6.19/arch/powerpc/boot/Makefile 2006-12-05 16:13:37.000000000 +0000+@@ -176,3 +176,18 @@++ clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip.gz)+ clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.bin.gz)++++#-----------------------------------------------------------++# install mkvmlinuz support files++#-----------------------------------------------------------++quiet_cmd_mkvmlinuz = INSTALL mkvmlinuz support files++ cmd_mkvmlinuz = cp -f $? $(INSTALL_MKVMLINUZ)++++mkvmlinuz-files := $(extra-y) $(wrapper) $(addprefix $(obj)/,$(hostprogs-y))++++$(obj)/mkvmlinuz_support_install: $(mkvmlinuz-files)++ mkdir -p $(INSTALL_MKVMLINUZ)++ $(call cmd,mkvmlinuz)++++targets += mkvmlinuz_support_install++
--- /dev/null Thu Jan 01 00:00:00 1970 +0000+++ b/2.6.19/ppc/powerpc-mkvmlinuz-support-ppc.patch Sun Jan 21 01:43:13 2007 +0100@@ -0,0 +1,48 @@+#+# Mkvmlinuz support patch, called by debian's kernel-package to generate+# the files needed by mkvmlinuz to generate the bootable images from vmlinux.+# Author: Sven Luther <luther@debian.org>+# Based on work from: Jens Schmalzing <jensen@debian.org>+# Original comment from Jens :+# This shell script is intended to be put into the debian subdirectory+# of a Linux kernel tree, where make-kpkg will find and execute it+# while building a kernel-image package. The purpose of this script+# is to add glue (object code, libraries, utilities and so on) from+# the kernel tree to the kernel-image package. Later, the mkvmlinuz+# utility, which is available as a separate Debian package, can use+# this glue to create a bootable compressed kernel from the+# uncompressed kernel in the kernel-image package and optionally a+# ramdisk. This is especially important on PowerPC subarchitectures+# that don't have a boot loader, but also comes handy for rescue+# systems and the like.+# Upstream status: well, this is a debian specific hack, it would be nice+# if it was going upstream, but probably not in this form.+#+--- linux-kernel-2.6.12-2.6.12/arch/ppc/boot/Makefile.orig 2005-07-15 12:46:28.000000000 +0000++++ linux-kernel-2.6.12-2.6.12/arch/ppc/boot/Makefile 2005-07-15 12:55:56.000000000 +0000+@@ -32,3 +32,25 @@+ $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \+ $(addprefix $(obj)/,$(hostprogs-y))+ $(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)++++mkvmlinuz_support_install:++ # mkvmlinuz support, based on work done originally by Jens Schmalzing <jensen@debian.org>++ mkdir -p $(INSTALL_MKVMLINUZ)/boot++ install -m 644 ld.script $(INSTALL_MKVMLINUZ)/boot++++ mkdir -p $(INSTALL_MKVMLINUZ)/lib++ install -m 644 ../../../lib/lib.a $(INSTALL_MKVMLINUZ)/lib++ install -m 644 lib/lib.a $(INSTALL_MKVMLINUZ)/lib/ppc.a++ install -m 644 common/lib.a $(INSTALL_MKVMLINUZ)/lib/common.a++ if [ -e of1275/lib.a ]; then \++ install -m 644 of1275/lib.a $(INSTALL_MKVMLINUZ)/lib/of.a; \++ fi++++ mkdir -p $(INSTALL_MKVMLINUZ)/obj/simple++ install -m 644 simple/*.o $(INSTALL_MKVMLINUZ)/obj/simple++ rm -f $(INSTALL_MKVMLINUZ)/obj/simple/image*.o++++ mkdir -p $(INSTALL_MKVMLINUZ)/utils++ install -m 755 utils/mkbugboot $(INSTALL_MKVMLINUZ)/utils++ install -m 755 utils/mkprep $(INSTALL_MKVMLINUZ)/utils++ install -m 755 utils/mktree $(INSTALL_MKVMLINUZ)/utils