diff options
| -rw-r--r-- | meta/packages/linux/linux-2.6.22/cm-x270/0009-cursor-fix.patch | 43 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0001-cm-x270-base2.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0001-cm-x270-base2.patch) | 69 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0002-cm-x270-match-type.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0002-cm-x270-match-type.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0003-cm-x270-ide.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0003-cm-x270-ide.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0004-cm-x270-it8152.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0004-cm-x270-it8152.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0005-cm-x270-pcmcia.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0006-ramdisk_load.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0006-ramdisk_load.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0007-mmcsd_large_cards-r0.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0007-mmcsd_large_cards-r0.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/0008-cm-x270-nand-simplify-name.patch (renamed from meta/packages/linux/linux-2.6.22/cm-x270/0008-cm-x270-nand-simplify-name.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/linux/linux-2.6.23/cm-x270/defconfig (renamed from meta/packages/linux/linux-2.6.22/cm-x270/defconfig) | 160 | ||||
| -rw-r--r-- | meta/packages/linux/linux.inc | 30 | ||||
| -rw-r--r-- | meta/packages/linux/linux_2.6.23.bb (renamed from meta/packages/linux/linux_2.6.22.bb) | 19 |
12 files changed, 130 insertions, 191 deletions
diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0009-cursor-fix.patch b/meta/packages/linux/linux-2.6.22/cm-x270/0009-cursor-fix.patch deleted file mode 100644 index 08b0db36b0..0000000000 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0009-cursor-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 94a59c25e4e0aec3c4d12e0c63e144e6af447368 Mon Sep 17 00:00:00 2001 -From: Cliff Brake <cbrake@happy.dev.bec-systems.com> -Date: Fri, 20 Jul 2007 19:04:42 -0400 -Subject: [PATCH] cursor-fix - ---- - drivers/char/vt.c | 4 ++-- - drivers/char/vt_ioctl.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/drivers/char/vt.c b/drivers/char/vt.c -index 6650ae1..649474e 100644 ---- a/drivers/char/vt.c -+++ b/drivers/char/vt.c -@@ -3491,8 +3491,8 @@ void do_blank_screen(int entering_gfx) - } - return; - } -- if (blank_state != blank_normal_wait) -- return; -+ //if (blank_state != blank_normal_wait) -+ // return; - blank_state = blank_off; - - /* entering graphics mode? */ -diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c -index c6f6f42..94121ff 100644 ---- a/drivers/char/vt_ioctl.c -+++ b/drivers/char/vt_ioctl.c -@@ -489,8 +489,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, - if (vc->vc_mode == (unsigned char) arg) - return 0; - vc->vc_mode = (unsigned char) arg; -- if (console != fg_console) -- return 0; -+ //if (console != fg_console) -+ // return 0; - /* - * explicitly blank/unblank the screen if switching modes - */ --- -1.5.1.6 - diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0001-cm-x270-base2.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0001-cm-x270-base2.patch index 9a635c5cbc..dc68ce9d43 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0001-cm-x270-base2.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0001-cm-x270-base2.patch @@ -1,4 +1,4 @@ -From 0db989f536f29c343bb4e42dc0b34d892d86de60 Mon Sep 17 00:00:00 2001 +From 299199b0cf17d0247a58af6ccd6cf6b859c60e9a Mon Sep 17 00:00:00 2001 From: Cliff Brake <cbrake@happy.dev.bec-systems.com> Date: Fri, 20 Jul 2007 18:55:59 -0400 Subject: [PATCH] cm-x270-base2 @@ -6,7 +6,7 @@ Subject: [PATCH] cm-x270-base2 --- arch/arm/Kconfig | 8 +- arch/arm/configs/cm_x270_defconfig | 1567 +++++++++++++++++++++++++++++++++++ - arch/arm/mach-pxa/Kconfig | 5 + + arch/arm/mach-pxa/Kconfig | 6 + arch/arm/mach-pxa/Makefile | 7 + arch/arm/mach-pxa/cm-x270.c | 821 ++++++++++++++++++ drivers/leds/Kconfig | 6 + @@ -18,17 +18,17 @@ Subject: [PATCH] cm-x270-base2 include/asm-arm/arch-pxa/hardware.h | 11 + include/asm-arm/arch-pxa/irqs.h | 20 + include/asm-arm/memory.h | 10 + - 14 files changed, 2666 insertions(+), 1 deletions(-) + 14 files changed, 2667 insertions(+), 1 deletions(-) create mode 100644 arch/arm/configs/cm_x270_defconfig create mode 100644 arch/arm/mach-pxa/cm-x270.c create mode 100644 drivers/leds/leds-cm-x270.c create mode 100644 include/asm-arm/arch-pxa/cm-x270.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 50d9f3e..dec0a27 100644 +index 691aae3..b9a2b11 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -519,7 +519,7 @@ config ISA_DMA_API +@@ -534,7 +534,7 @@ config ISA_DMA_API bool config PCI @@ -37,7 +37,7 @@ index 50d9f3e..dec0a27 100644 help Find out whether you have a PCI motherboard. PCI is the name of a bus system, i.e. the way the CPU talks to the other stuff inside -@@ -537,6 +537,12 @@ config PCI_HOST_VIA82C505 +@@ -555,6 +555,12 @@ config PCI_HOST_VIA82C505 depends on PCI && ARCH_SHARK default y @@ -1624,34 +1624,35 @@ index 0000000..f728363 +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig -index 5c0a100..e1cd439 100644 +index 5ebec6d..e126926 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig -@@ -37,6 +37,11 @@ config MACH_TRIZEPS4 - bool "Keith und Koep Trizeps4 DIMM-Module" +@@ -40,6 +40,12 @@ config MACH_TRIZEPS4 + config MACH_EM_X270 + bool "CompuLab EM-x270 platform" select PXA27x - ++ select IWMMXT ++ +config MACH_ARMCORE + bool "CompuLab CM-X270 modules" + select PXA27x + select IWMMXT -+ + endchoice - if PXA_SHARPSL diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile -index 9093eb1..2a110f8 100644 +index 7d6ab5c..b369289 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile -@@ -18,6 +18,7 @@ obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o sharpsl_pm.o sp - obj-$(CONFIG_MACH_AKITA) += akita-ioexp.o +@@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_AKITA) += akita-ioexp.o obj-$(CONFIG_MACH_POODLE) += poodle.o corgi_ssp.o obj-$(CONFIG_MACH_TOSA) += tosa.o + obj-$(CONFIG_MACH_EM_X270) += em-x270.o +obj-$(CONFIG_MACH_ARMCORE) += cm-x270.o # Support for blinky lights led-y := leds.o -@@ -25,6 +26,8 @@ led-$(CONFIG_ARCH_LUBBOCK) += leds-lubbock.o +@@ -26,6 +27,8 @@ led-$(CONFIG_ARCH_LUBBOCK) += leds-lubbock.o led-$(CONFIG_MACH_MAINSTONE) += leds-mainstone.o led-$(CONFIG_ARCH_PXA_IDP) += leds-idp.o led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o @@ -1660,7 +1661,7 @@ index 9093eb1..2a110f8 100644 obj-$(CONFIG_LEDS) += $(led-y) -@@ -35,3 +38,7 @@ obj-$(CONFIG_PXA_SSP) += ssp.o +@@ -36,3 +39,7 @@ obj-$(CONFIG_PXA_SSP) += ssp.o ifeq ($(CONFIG_PXA27x),y) obj-$(CONFIG_PM) += standby.o endif @@ -1670,7 +1671,7 @@ index 9093eb1..2a110f8 100644 +endif diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c new file mode 100644 -index 0000000..88b080d +index 0000000..7b4e288 --- /dev/null +++ b/arch/arm/mach-pxa/cm-x270.c @@ -0,0 +1,821 @@ @@ -2445,7 +2446,7 @@ index 0000000..88b080d +{ + int irq; + -+ pxa_init_irq(); ++ pxa27x_init_irq(); + + IT8152_INTC_PDCNIMR = 0xffff; + @@ -2496,10 +2497,10 @@ index 0000000..88b080d + .init_machine = cmx270_init, +MACHINE_END diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig -index 87d2046..1023411 100644 +index 4468cb3..02b04e2 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -89,6 +89,12 @@ config LEDS_H1940 +@@ -87,6 +87,12 @@ config LEDS_H1940 help This option enables support for the LEDs on the h1940. @@ -2513,13 +2514,13 @@ index 87d2046..1023411 100644 tristate "LED Support for Cobalt Server front LED" depends on LEDS_CLASS && MIPS_COBALT diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile -index aa2c18e..808900c 100644 +index f8995c9..12a860c 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o - obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o +@@ -17,6 +17,7 @@ obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_H1940) += leds-h1940.o obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o + obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o +obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o # LED Triggers @@ -2657,10 +2658,10 @@ index 0000000..63b7e9e +MODULE_DESCRIPTION("Corgi LED driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig -index b49375a..7ee6561 100644 +index c551925..b34f875 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -875,6 +875,14 @@ config DM9000 +@@ -940,6 +940,14 @@ config DM9000 <file:Documentation/networking/net-modules.txt>. The module will be called dm9000. @@ -2676,10 +2677,10 @@ index b49375a..7ee6561 100644 tristate "SMSC LAN911[5678] support" select CRC32 diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c -index 264fa0e..4e2954b 100644 +index 738aa59..2371c6b 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c -@@ -562,6 +562,7 @@ dm9000_probe(struct platform_device *pdev) +@@ -577,6 +577,7 @@ dm9000_probe(struct platform_device *pdev) db->mii.mdio_read = dm9000_phy_read; db->mii.mdio_write = dm9000_phy_write; @@ -2687,7 +2688,7 @@ index 264fa0e..4e2954b 100644 /* Read SROM content */ for (i = 0; i < 64; i++) ((u16 *) db->srom)[i] = read_srom_word(db, i); -@@ -569,6 +570,11 @@ dm9000_probe(struct platform_device *pdev) +@@ -584,6 +585,11 @@ dm9000_probe(struct platform_device *pdev) /* Set Node Address */ for (i = 0; i < 6; i++) ndev->dev_addr[i] = db->srom[i]; @@ -2777,10 +2778,10 @@ index 0000000..24613a5 + + diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h -index e2bdc2f..989303a 100644 +index 3861217..beb240e 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h -@@ -90,4 +90,15 @@ extern unsigned int get_lcdclk_frequency_10khz(void); +@@ -126,4 +126,15 @@ extern unsigned int get_lcdclk_frequency_10khz(void); #endif @@ -2797,10 +2798,10 @@ index e2bdc2f..989303a 100644 + #endif /* _ASM_ARCH_HARDWARE_H */ diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h -index 67ed436..f9c075f 100644 +index a07fe0f..efb3d42 100644 --- a/include/asm-arm/arch-pxa/irqs.h +++ b/include/asm-arm/arch-pxa/irqs.h -@@ -222,3 +222,23 @@ +@@ -216,3 +216,23 @@ #define IRQ_LOCOMO_GPIO_BASE (IRQ_BOARD_START + 1) #define IRQ_LOCOMO_LT_BASE (IRQ_BOARD_START + 2) #define IRQ_LOCOMO_SPI_BASE (IRQ_BOARD_START + 3) @@ -2846,5 +2847,5 @@ index d9bfb39..83db3cb 100644 #define ISA_DMA_THRESHOLD (0xffffffffULL) #endif -- -1.5.1.6 +1.5.2.5 diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0002-cm-x270-match-type.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0002-cm-x270-match-type.patch index 68da30191c..68da30191c 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0002-cm-x270-match-type.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0002-cm-x270-match-type.patch diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0003-cm-x270-ide.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0003-cm-x270-ide.patch index 0ff115efc8..0ff115efc8 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0003-cm-x270-ide.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0003-cm-x270-ide.patch diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0004-cm-x270-it8152.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0004-cm-x270-it8152.patch index 274eaf24d8..274eaf24d8 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0004-cm-x270-it8152.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0004-cm-x270-it8152.patch diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0005-cm-x270-pcmcia.patch index 7dceff5c9d..7dceff5c9d 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0005-cm-x270-pcmcia.patch diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0006-ramdisk_load.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0006-ramdisk_load.patch index aa25dd9bfc..aa25dd9bfc 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0006-ramdisk_load.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0006-ramdisk_load.patch diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0007-mmcsd_large_cards-r0.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0007-mmcsd_large_cards-r0.patch index 90e66b5308..90e66b5308 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0007-mmcsd_large_cards-r0.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0007-mmcsd_large_cards-r0.patch diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/0008-cm-x270-nand-simplify-name.patch b/meta/packages/linux/linux-2.6.23/cm-x270/0008-cm-x270-nand-simplify-name.patch index c07f049e56..c07f049e56 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/0008-cm-x270-nand-simplify-name.patch +++ b/meta/packages/linux/linux-2.6.23/cm-x270/0008-cm-x270-nand-simplify-name.patch diff --git a/meta/packages/linux/linux-2.6.22/cm-x270/defconfig b/meta/packages/linux/linux-2.6.23/cm-x270/defconfig index 63bc69533f..273de85b0a 100644 --- a/meta/packages/linux/linux-2.6.22/cm-x270/defconfig +++ b/meta/packages/linux/linux-2.6.23/cm-x270/defconfig @@ -1,13 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.22 -# Tue Aug 7 15:22:23 2007 +# Linux kernel version: 2.6.23 +# Thu Oct 11 15:47:57 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_TIME=y -# CONFIG_GENERIC_CLOCKEVENTS is not set +CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_MMU=y # CONFIG_NO_IOPORT is not set CONFIG_GENERIC_HARDIRQS=y @@ -27,26 +27,21 @@ CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # -# Code maturity level options +# General setup # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# CONFIG_LOCALVERSION="-cm-x270" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_IPC_NS is not set CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set -# CONFIG_UTS_NS is not set +# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -71,7 +66,6 @@ CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -81,24 +75,17 @@ CONFIG_SLAB=y CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y - -# -# Block layer -# CONFIG_BLOCK=y # CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set # CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set # # IO Schedulers @@ -139,6 +126,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" # CONFIG_ARCH_L7200 is not set # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_MXC is not set # CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set @@ -158,10 +146,19 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_PXA_IDP is not set # CONFIG_PXA_SHARPSL is not set # CONFIG_MACH_TRIZEPS4 is not set +# CONFIG_MACH_EM_X270 is not set CONFIG_MACH_ARMCORE=y CONFIG_PXA27x=y # +# Boot options +# + +# +# Power management +# + +# # Processor Type # CONFIG_CPU_32=y @@ -186,6 +183,7 @@ CONFIG_XSCALE_PMU=y # Bus support # # CONFIG_PCI is not set +# CONFIG_PCI_SYSCALL is not set # CONFIG_ARCH_SUPPORTS_MSI is not set # @@ -196,9 +194,10 @@ CONFIG_XSCALE_PMU=y # # Kernel Features # -# CONFIG_TICK_ONESHOT is not set +CONFIG_TICK_ONESHOT=y +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y -CONFIG_NO_IDLE_HZ=y CONFIG_HZ=100 CONFIG_AEABI=y CONFIG_OABI_COMPAT=y @@ -213,6 +212,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPLIT_PTLOCK_CPUS=4096 # CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y CONFIG_ALIGNMENT_TRAP=y # @@ -245,6 +246,7 @@ CONFIG_BINFMT_ELF=y # Power management options # # CONFIG_PM is not set +CONFIG_SUSPEND_UP_POSSIBLE=y # # Networking @@ -330,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_MAC80211 is not set # CONFIG_IEEE80211 is not set # CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -342,10 +345,6 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_SYS_HYPERVISOR is not set - -# -# Connector - unified userspace <-> kernelspace linker -# # CONFIG_CONNECTOR is not set CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set @@ -436,20 +435,8 @@ CONFIG_MTD_NAND_CM_X270=y # UBI - Unsorted block images # # CONFIG_MTD_UBI is not set - -# -# Parallel port support -# # CONFIG_PARPORT is not set - -# -# Plug and Play support -# -# CONFIG_PNPACPI is not set - -# -# Block devices -# +CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set @@ -468,6 +455,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +CONFIG_SCSI_DMA=y # CONFIG_SCSI_TGT is not set # CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y @@ -497,36 +485,23 @@ CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set # CONFIG_SCSI_SAS_LIBSAS is not set - -# -# SCSI low-level drivers -# +CONFIG_SCSI_LOWLEVEL=y # CONFIG_ISCSI_TCP is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_ATA is not set - -# -# Multi-device support (RAID and LVM) -# # CONFIG_MD is not set - -# -# Network device support -# CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # CONFIG_PHYLIB is not set - -# -# Ethernet (10 or 100Mbit) -# CONFIG_NET_ETHERNET=y CONFIG_MII=y +# CONFIG_AX88796 is not set # CONFIG_SMC91X is not set CONFIG_DM9000=y CONFIG_DM9000_NOEPROM=y @@ -566,10 +541,6 @@ CONFIG_USB_NET_MCS7830=m # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# # CONFIG_ISDN is not set # @@ -614,9 +585,11 @@ CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_APPLETOUCH is not set # CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set @@ -660,20 +633,12 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set - -# -# IPMI -# # CONFIG_IPMI_HANDLER is not set # CONFIG_WATCHDOG is not set CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# # CONFIG_TCG_TPM is not set CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y @@ -695,6 +660,7 @@ CONFIG_I2C_PXA=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_TINY_USB is not set @@ -703,11 +669,13 @@ CONFIG_I2C_PXA=m # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set @@ -718,14 +686,11 @@ CONFIG_I2C_PXA=m # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# # CONFIG_W1 is not set CONFIG_HWMON=y # CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ABITUGURU3 is not set # CONFIG_SENSORS_AD7418 is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set @@ -752,13 +717,16 @@ CONFIG_HWMON=y # CONFIG_SENSORS_LM87 is not set # CONFIG_SENSORS_LM90 is not set # CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_VT1211 is not set # CONFIG_SENSORS_W83781D is not set # CONFIG_SENSORS_W83791D is not set @@ -768,19 +736,13 @@ CONFIG_HWMON=y # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set - -# -# Misc devices -# +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set # # Multifunction device drivers # # CONFIG_MFD_SM501 is not set - -# -# LED devices -# CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -788,6 +750,7 @@ CONFIG_LEDS_CLASS=y # LED drivers # CONFIG_LEDS_CM_X270=y +# CONFIG_LEDS_GPIO is not set # # LED Triggers @@ -811,6 +774,7 @@ CONFIG_LEDS_CM_X270=y # # CONFIG_DISPLAY_SUPPORT is not set # CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set # CONFIG_FB_DDC is not set @@ -843,6 +807,7 @@ CONFIG_FB_PXA_PARAMETERS=y # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FONTS is not set CONFIG_FONT_8x8=y @@ -896,14 +861,15 @@ CONFIG_SND_PXA2XX_AC97=m # CONFIG_SND_SOC is not set # -# Open Sound System +# SoC Audio support for SuperH # -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m # -# HID Devices +# Open Sound System # +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y CONFIG_HID=y # CONFIG_HID_DEBUG is not set @@ -914,10 +880,7 @@ CONFIG_USB_HID=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set - -# -# USB support -# +CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB_ARCH_HAS_EHCI is not set @@ -941,6 +904,7 @@ CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set # # USB Device Class drivers @@ -1024,17 +988,27 @@ CONFIG_MMC=m # MMC/SD Card Drivers # CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y # # MMC/SD Host Controller Drivers # CONFIG_MMC_PXA=m +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set # -# Real Time Clock +# DMA Engine support +# +# CONFIG_DMA_ENGINE is not set + +# +# DMA Clients +# + +# +# DMA Devices # -CONFIG_RTC_LIB=y -# CONFIG_RTC_CLASS is not set # # File systems @@ -1130,7 +1104,6 @@ CONFIG_JFFS2_RTIME=y # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types @@ -1211,10 +1184,6 @@ CONFIG_FRAME_POINTER=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set - -# -# Cryptographic options -# # CONFIG_CRYPTO is not set # @@ -1225,6 +1194,7 @@ CONFIG_BITREVERSE=y # CONFIG_CRC16 is not set # CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y +# CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y diff --git a/meta/packages/linux/linux.inc b/meta/packages/linux/linux.inc index 41b0c13179..bb2ad455fd 100644 --- a/meta/packages/linux/linux.inc +++ b/meta/packages/linux/linux.inc @@ -4,20 +4,13 @@ LICENSE = "GPL" inherit kernel -# These devices need mkimage to generate a kernel image -DEPENDS_append_kb9202 = " u-boot-mkimage-openmoko-native " -DEPENDS_append_at32stk1000 = " u-boot-mkimage-openmoko-native " -DEPENDS_append_atngw100 = " u-boot-mkimage-openmoko-native " -DEPENDS_append_at91sam9263ek = " u-boot-mkimage-openmoko-native " -DEPENDS_append_at91sam9261ek = " u-boot-mkimage-openmoko-native " -DEPENDS_append_at91sam9260ek = " u-boot-mkimage-openmoko-native " -DEPENDS_append_sarge-at91 = " u-boot-mkimage-openmoko-native " -DEPENDS_append_gumstix-connex = " u-boot-mkimage-openmoko-native " -DEPENDS_append_gumstix-verdex = " u-boot-mkimage-openmoko-native " -DEPENDS_append_fic-gta01 = " u-boot-mkimage-openmoko-native " -DEPENDS_append_fic-gta02 = " u-boot-mkimage-openmoko-native " +# Not every device needs mkimage to generate a kernel image, but lets make OE a bit more +# friendly and increase the "Just Works(TM) factor. Building uboot takes only a minute. +DEPENDS += " u-boot-mkimage-openmoko-native " +RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" + # Specify the commandline for your device #boot from mmc @@ -42,7 +35,7 @@ do_configure_prepend() { # if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config - echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config else echo "# CONFIG_AEABI is not set" >> ${S}/.config echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config @@ -104,11 +97,16 @@ do_install_prepend() { if test -e arch/${ARCH}/boot/images/uImage ; then ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage fi + + if test -e arch/${ARCH}/kernel/vmlinux.lds ; then + ln -f arch/${ARCH}/kernel/vmlinux.lds arch/${ARCH}/boot/vmlinux + fi } UBOOT_ENTRYPOINT ?= "20008000" -KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME} +KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" +KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}" do_deploy() { install -d ${DEPLOY_DIR_IMAGE} @@ -128,6 +126,10 @@ do_deploy() { rm -f linux.bin.gz fi fi + + cd ${DEPLOY_DIR_IMAGE} + rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin + ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin } do_deploy[dirs] = "${S}" diff --git a/meta/packages/linux/linux_2.6.22.bb b/meta/packages/linux/linux_2.6.23.bb index b33274d8bf..e042c7248b 100644 --- a/meta/packages/linux/linux_2.6.22.bb +++ b/meta/packages/linux/linux_2.6.23.bb @@ -2,17 +2,17 @@ require linux.inc # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_avr32 = "1" DEFAULT_PREFERENCE_cm-x270 = "1" +DEFAULT_PREFERENCE_mpc8313e-rdb = "1" +DEFAULT_PREFERENCE_mpc8323e-rdb = "1" -PR = "r3" +PR = "r2" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ + file://binutils-buildid-arm.patch;patch=1 \ file://defconfig \ " -SRC_URI_append_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.22.atmel.3.patch.bz2;patch=1" - SRC_URI_append_cm-x270 = "\ file://0001-cm-x270-base2.patch;patch=1 \ file://0002-cm-x270-match-type.patch;patch=1 \ @@ -51,6 +51,15 @@ python do_compulab_image() { fo.write(size_s) fo.write(image_data) fo.close() + + os.chdir(deploy_dir) + link_file = bb.data.expand('${KERNEL_IMAGE_SYMLINK_NAME}', d) + '.cmx270' + img_file = bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270' + try: + os.unlink(link_file) + except: + pass + os.symlink(img_file, link_file) } addtask compulab_image after do_deploy before do_package |