diff options
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/LAB-kernel/h2200/defconfig | 85 | ||||
| -rw-r--r-- | packages/linux/LAB-kernel/h2200/labrun.patch | 85 | ||||
| -rw-r--r-- | packages/linux/LAB-kernel_2.6.13-hh2.bb | 38 | ||||
| -rw-r--r-- | packages/linux/LAB-kernel_cvs.bb | 9 |
4 files changed, 154 insertions, 63 deletions
diff --git a/packages/linux/LAB-kernel/h2200/defconfig b/packages/linux/LAB-kernel/h2200/defconfig index f964289927..466c2072f5 100644 --- a/packages/linux/LAB-kernel/h2200/defconfig +++ b/packages/linux/LAB-kernel/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-hh1 -# Wed Nov 30 09:48:34 2005 +# Thu Feb 16 14:58:20 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -111,6 +111,8 @@ CONFIG_H2200_PM=y # CONFIG_ARCH_AXIMX3 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set # CONFIG_PXA_SHARPSL is not set CONFIG_PXA25x=y CONFIG_PXA_KEYS=y @@ -156,7 +158,7 @@ CONFIG_ARMBOOT_LBL_SYSCALL=y CONFIG_LAB_ARMBOOT=y CONFIG_LAB_NANDDUMP=y CONFIG_LAB_NANDCHECK=y -# CONFIG_LAB_RUN is not set +CONFIG_LAB_RUN=y # # Processor Type @@ -241,7 +243,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 cachepolicy=writeback root=/dev/mmcblk0p1" +CONFIG_CMDLINE="console=ttyS0,115200n8 mem=64M" # CONFIG_XIP_KERNEL is not set # @@ -282,7 +284,7 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=m +CONFIG_PACKET=y # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y # CONFIG_NET_KEY is not set @@ -349,28 +351,7 @@ CONFIG_NETFILTER=y # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set -CONFIG_BT=m -CONFIG_BT_L2CAP=m -# CONFIG_BT_SCO is not set -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -# CONFIG_BT_BNEP_MC_FILTER is not set -# CONFIG_BT_BNEP_PROTO_FILTER is not set -# CONFIG_BT_HIDP is not set - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIUART_BCSP_TXCRC is not set -# CONFIG_BT_HCIDTL1 is not set -# CONFIG_BT_HCIBT3C is not set -# CONFIG_BT_HCIBLUECARD is not set -# CONFIG_BT_HCIBTUART is not set -# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT is not set # # Device Drivers @@ -473,13 +454,10 @@ CONFIG_MTD_NAND_HAMCOP=y # Block devices # # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CDROM_PKTCDVD is not set @@ -606,19 +584,19 @@ CONFIG_INPUT=y # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_H2200 is not set +CONFIG_KEYBOARD_H2200=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -718,7 +696,7 @@ CONFIG_I2C_PXA=y # # CONFIG_WATCHDOG is not set # CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=m +# CONFIG_SA1100_RTC is not set # CONFIG_S3C2410_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -756,8 +734,8 @@ CONFIG_SOC_MQ11XX=y # # Misc devices # -CONFIG_BATTERY_MONITOR=m -# CONFIG_H2200_BATTERY is not set +CONFIG_BATTERY_MONITOR=y +CONFIG_H2200_BATTERY=y # # Multimedia Capabilities Port drivers @@ -796,18 +774,7 @@ CONFIG_FB_MQ1100=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=m -CONFIG_FONTS=y -# CONFIG_FONT_8x8 is not set -# CONFIG_FONT_8x16 is not set -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -CONFIG_FONT_MINI_4x6=y -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set +# CONFIG_FRAMEBUFFER_CONSOLE is not set # # Logo configuration @@ -828,11 +795,12 @@ CONFIG_BACKLIGHT_H2200=y # # Dallas's 1-wire bus # -CONFIG_W1=m +CONFIG_W1=y # CONFIG_W1_THERM is not set # CONFIG_W1_SMEM is not set -# CONFIG_W1_SAMCOP is not set -CONFIG_W1_DS2760=m +CONFIG_W1_SAMCOP=y +CONFIG_W1_SAMCOP_ONE_DEVICE=y +CONFIG_W1_DS2760=y # # USB support @@ -881,8 +849,7 @@ CONFIG_MMC_SAMCOP=y # # LED devices # -CONFIG_CLASS_LEDS=m -# CONFIG_LEDS_H2200 is not set +# CONFIG_CLASS_LEDS is not set # # File systems @@ -956,7 +923,7 @@ CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_ZLIB=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set -CONFIG_CRAMFS=y +# CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -1034,7 +1001,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set -CONFIG_NLS_ISO8859_1=m +CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set @@ -1047,7 +1014,7 @@ CONFIG_NLS_ISO8859_1=m # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -CONFIG_NLS_UTF8=m +CONFIG_NLS_UTF8=y # # Profiling support diff --git a/packages/linux/LAB-kernel/h2200/labrun.patch b/packages/linux/LAB-kernel/h2200/labrun.patch new file mode 100644 index 0000000000..29ff10eda2 --- /dev/null +++ b/packages/linux/LAB-kernel/h2200/labrun.patch @@ -0,0 +1,85 @@ +Index: lab/lab-main.c +=================================================================== +RCS file: /cvs/linux/kernel26/lab/lab-main.c,v +retrieving revision 1.9 +diff -u -p -r1.9 lab-main.c +--- kernel26/lab/lab-main.c 22 Dec 2005 02:17:57 -0000 1.9 ++++ kernel26/lab/lab-main.c 16 Feb 2006 22:02:29 -0000 +@@ -18,7 +18,7 @@ + #include <linux/lab/lab.h> + #include <linux/lab/commands.h> + +- ++void lab_runfile(char *source, char *sourcefile); + + int globfail; + EXPORT_SYMBOL (globfail); +@@ -67,7 +67,7 @@ static void parseargs (char *argstr, int + while ((c = *argstr) != 0) { + enum ParseState newState; + +- if (c == ';' && lastState != PS_STRING && lastState != PS_ESCAPE) ++ if ((c == ';' || c == '\n') && lastState != PS_STRING && lastState != PS_ESCAPE) + break; + + if (lastState == PS_ESCAPE) { +@@ -106,7 +106,7 @@ static void parseargs (char *argstr, int + if (argc_p != NULL) + *argc_p = argc; + +- if (*argstr == ';') ++ if (*argstr == ';' || *argstr == '\n') + *argstr++ = 0; + + *resid = argstr; +@@ -189,6 +189,7 @@ EXPORT_SYMBOL (lab_exec_string); + + static char *blockdevs[] = { + "/dev/mmc/blk0/part1", "ext2", ++ "/dev/ide/host0/bus0/target0/lun0/part1", "ext2", + "/dev/mtdblock/3", "jffs2", + NULL + }; +@@ -222,19 +223,19 @@ void lab_main (int cmdline) + } + lab_puts ("\r\n" + ">> Booting now.\r\n"); +- sys_mkdir("/fs", 0000); ++ sys_mkdir("/mnt", 0000); + sys_mount("/dev", "/dev", "devfs", 0, ""); + lab_puts (">> Looking for filesystems...\r\n"); + blockdev = blockdevs; + while (*blockdev) { + lab_printf(" >> Trying \"%s\"... ", blockdev[0]); +- if (sys_mount(blockdev[0], "/fs", blockdev[1], MS_RDONLY, "") >= 0) { ++ if (sys_mount(blockdev[0], "/mnt", blockdev[1], MS_RDONLY, "") >= 0) { + struct stat sstat; +- ++ + lab_printf("ok"); +- if (sys_newstat("/fs/boot/zImage", &sstat) < 0) { +- lab_printf(", but no zImage.\r\n"); +- sys_oldumount("/fs"); ++ if (sys_newstat("/mnt/boot/labrun", &sstat) < 0) { ++ lab_printf(", but no labrun.\r\n"); ++ sys_oldumount("/mnt"); + blockdev += 2; + continue; + } +@@ -249,12 +250,10 @@ void lab_main (int cmdline) + lab_printf(">> No bootable filesystems found!\r\n"); + goto domenu; + } +- lab_printf(">> Copying zImage... "); +- lab_copy("fs", "/fs/boot/zImage", "fs", "/zImage"); +- lab_printf("done\r\n>> Unmounting filesystem... "); +- sys_oldumount("/fs"); +- lab_printf("done\r\n>> Booting kernel.\r\n"); +- lab_armboot("fs", "/zImage", NULL); ++ ++ lab_printf(">> Executing labrun...\r\n"); ++ lab_runfile("fs", "/mnt/boot/labrun"); ++ lab_printf("done\r\n"); + } + + domenu: diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb new file mode 100644 index 0000000000..f50baf64ad --- /dev/null +++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb @@ -0,0 +1,38 @@ +SECTION = "kernel" +DESCRIPTION = "Liux As Bootloader kernelm" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +LICENSE = "GPL" + +KERNEL_CCSUFFIX = "-3.4.4" +COMPATIBLE_HOST = "arm.*-linux" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://labrun.patch;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/kernel26" + +inherit kernel + +K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}" +K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}" +K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}" +HHV = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}" + +KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" +do_configure() { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No default configuration for ${MACHINE} available." + yes '' | oe_runmake oldconfig +} + +do_deploy() { + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile + diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb index 6258a113d6..09a2dfcf18 100644 --- a/packages/linux/LAB-kernel_cvs.bb +++ b/packages/linux/LAB-kernel_cvs.bb @@ -3,17 +3,18 @@ DESCRIPTION = "Liux As Bootloader kernelm" MAINTAINER = "Koen Kooi <koen@handhelds.org>" LICENSE = "GPL" PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}" -# + +DEFAULT_PREFERENCE = "-1" + KERNEL_CCSUFFIX = "-3.4.4" COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ + file://labrun.patch;patch=1 \ file://defconfig" -#SRC_URI += bootshim? - S = "${WORKDIR}/kernel26" inherit kernel @@ -21,7 +22,7 @@ inherit kernel K_MAJOR = "2" K_MINOR = "6" K_MICRO = "13" -HHV = "1" +HHV = "2" # KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}" |