[oe-commits] org.oe.dev merge of '41bd70251806e7dc04496b3cba1b258f8bb9d558'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Jul 3 14:33:48 UTC 2007
merge of '41bd70251806e7dc04496b3cba1b258f8bb9d558'
and 'fbab458bd1cf99cca4f4482a9a55baf74d033ed2'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 2b438b3f55a45490f30d36bd6006d73826a40b2e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2b438b3f55a45490f30d36bd6006d73826a40b2e
Files:
1
packages/linux/linux-hackndev-2.6/palmld/defconfig
conf/machine/include/motorola-ezx-base.inc
packages/kazehakase/kazehakase_cvs.bb
packages/slugos-init/files/boot/kexec
conf/distro/angstrom-2007.1-legacy.conf
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/sane-srcdates.inc
conf/machine/a1200.conf
conf/machine/a780.conf
conf/machine/e680.conf
conf/machine/rokr-e2.conf
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-fsg3.h
packages/kazehakase/kazehakase_0.4.5.bb
packages/kazehakase/kazehakase_0.4.7.bb
packages/php/php_5.1.4.bb
packages/php/php_5.2.0.bb
packages/slugos-init/files/boot/network
packages/slugos-init/files/functions
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
packages/tasks/task-slugos.bb
Diffs:
#
# mt diff -r41bd70251806e7dc04496b3cba1b258f8bb9d558 -r2b438b3f55a45490f30d36bd6006d73826a40b2e
#
#
#
# patch "packages/linux/linux-hackndev-2.6/palmld/defconfig"
# from [18cced22397f2b63796bbcf120517ce9c26901ec]
# to [d32cf1b06324559befddf07b45b8d50a55cc2ca0]
#
============================================================
--- packages/linux/linux-hackndev-2.6/palmld/defconfig 18cced22397f2b63796bbcf120517ce9c26901ec
+++ packages/linux/linux-hackndev-2.6/palmld/defconfig d32cf1b06324559befddf07b45b8d50a55cc2ca0
@@ -1,11 +1,14 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20-hnd0
-# Tue Feb 27 17:46:56 2007
+# Linux kernel version: 2.6.21-hnd2
+# Tue Jul 3 14:32:58 2007
#
CONFIG_ARM=y
-# CONFIG_GENERIC_TIME is not set
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
CONFIG_GENERIC_HARDIRQS=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
@@ -15,6 +18,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_ARCH_MTD_XIP=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -34,6 +38,7 @@ CONFIG_SYSVIPC=y
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
@@ -42,7 +47,7 @@ CONFIG_SYSFS_DEPRECATED=y
# CONFIG_IKCONFIG is not set
CONFIG_SYSFS_DEPRECATED=y
# CONFIG_RELAY is not set
-# CONFIG_INITRAMFS_SOURCE is not set
+# CONFIG_BLK_DEV_INITRD is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
# CONFIG_EMBEDDED is not set
@@ -120,6 +125,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_PNX4008 is not set
CONFIG_ARCH_PXA=y
# CONFIG_ARCH_RPC is not set
@@ -128,6 +134,8 @@ CONFIG_ARCH_PXA=y
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_OMAP is not set
+# CONFIG_BOARD_IRQ_MAP_SMALL is not set
+# CONFIG_BOARD_IRQ_MAP_BIG is not set
#
# Intel PXA2xx Implementations
@@ -156,6 +164,7 @@ CONFIG_ARCH_PXA=y
# CONFIG_MACH_BLUEANGEL is not set
# CONFIG_MACH_HTCBEETLES is not set
# CONFIG_MACH_HW6900 is not set
+# CONFIG_MACH_HTCATHENA is not set
# CONFIG_ARCH_AXIMX3 is not set
# CONFIG_ARCH_AXIMX5 is not set
# CONFIG_MACH_X50 is not set
@@ -165,22 +174,25 @@ CONFIG_PALMLD_IDE=m
CONFIG_PALMLD_PCMCIA=m
# CONFIG_PALMLD_USB is not set
CONFIG_PALMLD_IDE=m
+CONFIG_PALMLD_BATTERY=m
+CONFIG_PALMLD_PM=y
# CONFIG_MACH_XSCALE_PALMTREO650 is not set
# CONFIG_MACH_XSCALE_TREO680 is not set
# CONFIG_MACH_T700WX is not set
# CONFIG_MACH_TUNGE2 is not set
# CONFIG_MACH_T3XSCALE is not set
-CONFIG_GPIOED=m
-CONFIG_GPIOEDNG=m
# CONFIG_MACH_XSCALE_PALMTT5 is not set
# CONFIG_MACH_XSCALE_PALMTX is not set
# CONFIG_MACH_PALMZ72 is not set
# CONFIG_MACH_OMAP_PALMTC is not set
# CONFIG_MACH_ZIRE31 is not set
+CONFIG_GPIOED=m
+CONFIG_GPIOEDNG=m
+# CONFIG_MACH_GHI270HG is not set
+# CONFIG_MACH_GHI270 is not set
# CONFIG_PXA_SHARPSL is not set
# CONFIG_MACH_TRIZEPS4 is not set
CONFIG_PXA27x=y
-CONFIG_PXA_RTC_EPOCH=1904
#
# Linux As Bootloader
@@ -204,20 +216,12 @@ CONFIG_ARM_THUMB=y
#
CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
CONFIG_IWMMXT=y
# CONFIG_ARMBOOT_PROC is not set
CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
#
-# Compaq/iPAQ Drivers
-#
-
-#
-# Compaq/HP iPAQ Drivers
-#
-
-#
# Bus support
#
@@ -251,6 +255,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
CONFIG_ALIGNMENT_TRAP=y
#
@@ -260,6 +265,8 @@ CONFIG_CMDLINE=""
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+# CONFIG_TXTOFFSET_DELTA is not set
#
# CPU Frequency scaling
@@ -287,8 +294,12 @@ CONFIG_BINFMT_ELF=y
#
# Power management options
#
-# CONFIG_PM is not set
-# CONFIG_APM is not set
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+# CONFIG_DPM_DEBUG is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
+CONFIG_APM_EMULATION=y
#
# Networking
@@ -305,7 +316,9 @@ CONFIG_XFRM=y
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -376,8 +389,8 @@ CONFIG_IRDA=y
#
# IrDA protocols
#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
+CONFIG_IRLAN=y
+CONFIG_IRNET=y
CONFIG_IRCOMM=y
CONFIG_IRDA_ULTRA=y
@@ -386,7 +399,7 @@ CONFIG_IRDA_ULTRA=y
#
# CONFIG_IRDA_CACHE_LAST_LSAP is not set
# CONFIG_IRDA_FAST_RR is not set
-CONFIG_IRDA_DEBUG=y
+# CONFIG_IRDA_DEBUG is not set
#
# Infrared-port device drivers
@@ -395,12 +408,11 @@ CONFIG_IRDA_DEBUG=y
#
# SIR device drivers
#
-CONFIG_IRTTY_SIR=y
+# CONFIG_IRTTY_SIR is not set
#
# Dongle support
#
-# CONFIG_DONGLE is not set
#
# Old SIR device drivers
@@ -414,16 +426,16 @@ CONFIG_IRTTY_SIR=y
#
# FIR device drivers
#
-CONFIG_PXA_FICP=m
+CONFIG_PXA_FICP=y
CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
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
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_HIDP=m
#
# Bluetooth device drivers
@@ -433,17 +445,11 @@ CONFIG_BT_HCIUART_H4=y
# CONFIG_BT_HCIUART_BCSP is not set
# CONFIG_BT_HCIDTL1 is not set
# CONFIG_BT_HCIBT3C is not set
+CONFIG_BT_BCM2035UART=m
# CONFIG_BT_HCIBLUECARD is not set
# CONFIG_BT_HCIBTUART is not set
# CONFIG_BT_HCIVHCI is not set
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
-CONFIG_IEEE80211_SOFTMAC=m
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
-CONFIG_WIRELESS_EXT=y
+# CONFIG_IEEE80211 is not set
#
# Device Drivers
@@ -516,6 +522,7 @@ CONFIG_MTD_ABSENT=m
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
# CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_IPAQ is not set
# CONFIG_MTD_IMPA7 is not set
# CONFIG_MTD_SHARP_SL is not set
# CONFIG_MTD_PLATRAM is not set
@@ -553,6 +560,7 @@ CONFIG_MTD_ABSENT=m
#
# Plug and Play support
#
+# CONFIG_PNPACPI is not set
#
# Block devices
@@ -565,7 +573,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_INITRD=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
@@ -593,7 +600,6 @@ CONFIG_IDE_GENERIC=y
CONFIG_IDE_GENERIC=y
# CONFIG_IDE_ARM is not set
# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_IDEDMA_AUTO is not set
# CONFIG_BLK_DEV_HD is not set
#
@@ -659,37 +665,13 @@ CONFIG_NETDEVICES=y
#
# Wireless LAN (non-hamradio)
#
-CONFIG_NET_RADIO=y
-# CONFIG_NET_WIRELESS_RTNETLINK is not set
+# CONFIG_NET_RADIO is not set
+# CONFIG_LIBERTAS is not set
+# CONFIG_LIBERTAS_CF8305 is not set
+# CONFIG_LIBERTAS_CF8381 is not set
+# CONFIG_LIBERTAS_CF8385 is not set
#
-# Obsolete Wireless cards support (pre-802.11)
-#
-# CONFIG_STRIP is not set
-# CONFIG_PCMCIA_WAVELAN is not set
-# CONFIG_PCMCIA_NETWAVE is not set
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-# CONFIG_PCMCIA_RAYCS is not set
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-# CONFIG_HERMES is not set
-# CONFIG_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-# CONFIG_AIRO_CS is not set
-# CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
-# CONFIG_ACX is not set
-CONFIG_NET_WIRELESS=y
-
-#
# PCMCIA network device support
#
# CONFIG_NET_PCMCIA is not set
@@ -698,17 +680,17 @@ CONFIG_NET_WIRELESS=y
# Wan interfaces
#
# CONFIG_WAN is not set
-CONFIG_PPP=m
+CONFIG_PPP=y
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_SYNC_TTY=y
+CONFIG_PPP_DEFLATE=y
# CONFIG_PPP_BSDCOMP is not set
# CONFIG_PPP_MPPE is not set
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set
-CONFIG_SLHC=m
+CONFIG_SLHC=y
# CONFIG_SHAPER is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
@@ -738,6 +720,7 @@ CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_TSDEV_SCREEN_Y=480
CONFIG_INPUT_EVDEV=y
# CONFIG_INPUT_EVBUG is not set
+# CONFIG_INPUT_LED_TRIGGER is not set
#
# Input Device Drivers
@@ -749,10 +732,10 @@ CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_GPIO_KEYS is not set
+# CONFIG_GPIODEV_KEYS is not set
+# CONFIG_GPIODEV_DIAGONAL is not set
CONFIG_KEYBOARD_PXA27x=y
-CONFIG_KEYBOARD_PALMIR=y
-# CONFIG_KEYBOARD_PALMWK is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
CONFIG_INPUT_TOUCHSCREEN=y
@@ -763,9 +746,8 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_ADC is not set
-# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_PALMTC is not set
CONFIG_TOUCHSCREEN_WM97XX=m
# CONFIG_TOUCHSCREEN_WM9705 is not set
CONFIG_TOUCHSCREEN_WM9712=y
@@ -808,6 +790,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_PXA_IR is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_RS232_SERIAL is not set
CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
@@ -823,9 +806,9 @@ CONFIG_HW_RANDOM=m
# CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=m
# CONFIG_NVRAM is not set
-CONFIG_SA1100_RTC=y
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
+# CONFIG_TIHTC is not set
#
# PCMCIA character devices
@@ -861,46 +844,45 @@ CONFIG_SA1100_RTC=y
#
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=y
+CONFIG_APM_POWER=y
+# CONFIG_BATTERY_DS2760 is not set
#
-# Hardware Monitoring - Battery
+# L3 serial bus support
#
-CONFIG_BATTERY_MONITOR=y
-# CONFIG_ADC_BATTERY is not set
+# CONFIG_L3 is not set
#
-# L3 serial bus support
+# Misc devices
#
-# CONFIG_L3 is not set
+# CONFIG_BATTCHARGE_MONITOR is not set
#
-# SoC drivers
+# Multimedia Capabilities Port drivers
#
+# CONFIG_ADC is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_ASIC2 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
# CONFIG_SOC_MQ11XX is not set
# CONFIG_SOC_T7L66XB is not set
# CONFIG_SOC_TC6387XB is not set
# CONFIG_SOC_TC6393XB is not set
-# CONFIG_SOC_SAMCOP is not set
-# CONFIG_SOC_HAMCOP is not set
-# CONFIG_HTC_ASIC2 is not set
-# CONFIG_HTC_ASIC3 is not set
-# CONFIG_HTC_ASIC3_DS1WM is not set
+# CONFIG_SOC_TSC2101 is not set
# CONFIG_SOC_TSC2200 is not set
#
-# Misc devices
-#
-CONFIG_BATTCHARGE_MONITOR=m
-
-#
-# Multimedia Capabilities Port drivers
-#
-# CONFIG_MCP is not set
-# CONFIG_ADC_ADS7846_SSP is not set
-# CONFIG_ADC_AD7877 is not set
-# CONFIG_TIFM_CORE is not set
-
-#
# LED devices
#
CONFIG_NEW_LEDS=y
@@ -916,8 +898,9 @@ CONFIG_LEDS_TRIGGER_TIMER=m
#
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_HWTIMER=m
CONFIG_LEDS_TRIGGER_IDE_DISK=y
-# CONFIG_LEDS_TRIGGER_MMC_CARD is not set
+CONFIG_LEDS_TRIGGER_MMC_CARD=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
# CONFIG_LEDS_TRIGGER_SHARED is not set
@@ -934,15 +917,26 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
#
# Graphics support
#
-CONFIG_FIRMWARE_EDID=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_PXAPWM=m
CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
# CONFIG_FB_IMAGEON is not set
# CONFIG_FB_S1D13XXX is not set
CONFIG_FB_PXA=y
@@ -958,21 +952,22 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
+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
#
# Logo configuration
#
# CONFIG_LOGO is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_PXAPWM=m
#
# Sound
@@ -1036,6 +1031,7 @@ CONFIG_HID=y
# HID Devices
#
CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
#
# USB support
@@ -1052,7 +1048,29 @@ CONFIG_USB_ARCH_HAS_OHCI=y
#
# USB Gadget Support
#
-# CONFIG_USB_GADGET is not set
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+CONFIG_USB_GADGET_SX2=y
+CONFIG_USB_SX2=m
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_MQ11XX is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_CHAR is not set
#
# MMC/SD Card support
@@ -1061,7 +1079,6 @@ CONFIG_MMC_PXA=y
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_BLOCK=y
CONFIG_MMC_PXA=y
-# CONFIG_MMC_TIFM_SD is not set
# CONFIG_MMC_TMIO is not set
# CONFIG_MMC_SAMCOP is not set
@@ -1069,9 +1086,32 @@ CONFIG_RTC_LIB=y
# Real Time Clock
#
CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_EPOCH=1904
+# CONFIG_RTC_DEBUG is not set
#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=y
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
# File systems
#
CONFIG_EXT2_FS=y
@@ -1128,6 +1168,7 @@ CONFIG_RAMFS=y
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
+# CONFIG_AUFS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
@@ -1136,6 +1177,7 @@ CONFIG_RAMFS=y
# CONFIG_JFFS2_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
+# CONFIG_SQUASHFS_LZMA is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -1265,8 +1307,10 @@ CONFIG_CRYPTO_CBC=m
# CONFIG_CRYPTO_GF128MUL is not set
CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set
@@ -1280,6 +1324,7 @@ CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfbab458bd1cf99cca4f4482a9a55baf74d033ed2 -r2b438b3f55a45490f30d36bd6006d73826a40b2e
#
#
#
# add_file "conf/machine/include/motorola-ezx-base.inc"
# content [0667c6b496dfb760566158b9fbbd7d6d278b90a6]
#
# add_file "packages/kazehakase/kazehakase_cvs.bb"
# content [1b5a8edcf4a52f628f27e5e38dff856525b60edc]
#
# add_file "packages/slugos-init/files/boot/kexec"
# content [b1ddcced6d9e71541270a6164d283c40b6bf4c53]
#
# patch "conf/distro/angstrom-2007.1-legacy.conf"
# from [6881282904bf0d4a7ea3e5a985cd8f22862e4561]
# to [c5b38dbf99bb41080ad1856aeae6bb5359c8d578]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [59159a926215caee1cf37b3d07c5a4bcf28deb10]
# to [5f9d6cf541be67c463ff4f89b5de124a851e5dc5]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [cb939b1a389e8b33c0bf4f658e709da4337a4add]
# to [c70c421338b418901a172a9210ea87a82ab763c0]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [5976f51d1a203540984b37aea9a01200c509f145]
# to [acd77cb1b7ff38f08af7ea0f756e371ee8730a48]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [b2c78cdbf95e8492c4d56dd1afcca640d4e1bf2e]
# to [211037ba3b8be809090a4a8d44a0ea8d709dae7e]
#
# patch "conf/machine/a1200.conf"
# from [a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/a780.conf"
# from [0b4ea0352725660f6f5612a0c0cb267b0274953e]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/e680.conf"
# from [987ace20df2d1dc626ea26f22b62e9dc7289adc5]
# to [4655da015ab00543ff0e0ed4f6eb7dcff60b8d28]
#
# patch "conf/machine/rokr-e2.conf"
# from [3c78073478e131d6f10f163a67a8c03cd4fa6593]
# to [0d6bee13f804137fbb6e3564ed46b0422b8dc682]
#
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
# from [363539e6aa9b48b4075ef6f22841c250058075ba]
# to [691bb266bc3a89e594d2718bda178991edd6718a]
#
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
# from [6420555a5dfd7edfd3e08a847c058eb380b637df]
# to [cf13549daefc67ce00ab2a9b1280d2363849d1e7]
#
# patch "packages/kazehakase/kazehakase_0.4.5.bb"
# from [2e14bb25ffbd6926f5a10ff4eb9a140996a469c3]
# to [33ebf750491386560f3a270602c11d797ef5bfb2]
#
# patch "packages/kazehakase/kazehakase_0.4.7.bb"
# from [c1051d793dabd07e39bcfb134d49967696a9bf43]
# to [b6fe737fdbc7bc21d3c74fa6ee5984c468f858a0]
#
# patch "packages/php/php_5.1.4.bb"
# from [faa45ca80e5ac5c9d8d718d4ccddc21f5f1510d8]
# to [9c66e44fe96affb7d82ed7a6bc9371c158f7d081]
#
# patch "packages/php/php_5.2.0.bb"
# from [6c43a643d25ef8834530c67de3fff093916c345e]
# to [b3ffd57d43ed9710b732bd9a0745a83a4a45e958]
#
# patch "packages/slugos-init/files/boot/network"
# from [7863638b33cded9710583ad3868e24dc35c04195]
# to [1998f275fdd6f6ea83d325e7fe519c4357799e70]
#
# patch "packages/slugos-init/files/functions"
# from [de19dc6cafe30138b066dde30da63533e5278a40]
# to [68db6b5c8036845c4660e107be5b5c6a9a1c0cad]
#
# patch "packages/slugos-init/files/modulefunctions"
# from [534b40287bd038eafad6f14953eb107d549b1230]
# to [2fa625b35ea31712fde433431b13ec9b7c79d43b]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [71bdfe52397be1f4556cf272c28ecf7f960558ae]
# to [838d2b4d97516e7beb1501277067200126a20075]
#
# patch "packages/tasks/task-slugos.bb"
# from [9b3a116faea9265f7fc10285942e53fbc831e391]
# to [b17910995413514e0b7ea24f7ea3468dd3c2d63e]
#
============================================================
--- conf/machine/include/motorola-ezx-base.inc 0667c6b496dfb760566158b9fbbd7d6d278b90a6
+++ conf/machine/include/motorola-ezx-base.inc 0667c6b496dfb760566158b9fbbd7d6d278b90a6
@@ -0,0 +1,33 @@
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+#cat /proc/mtd
+#dev: size erasesize name
+#mtd0: 00020000 00008000 "Bootloader"
+#mtd1: 000e0000 00020000 "Kernel"
+#mtd2: 00580000 00020000 "VFM_Filesystem"
+#mtd3: 00020000 00020000 "Logo"
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+
+#the EZX phones need a userspace daemon to stop the BP from shutting down the phone
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
+ROOT_FLASH_SIZE = "24"
+
+EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
+
+# Opentapi needs to be started very early so we need the mux devices in static /dev
+IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
+ files/device_table-ezx.txt"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+require conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- packages/kazehakase/kazehakase_cvs.bb 1b5a8edcf4a52f628f27e5e38dff856525b60edc
+++ packages/kazehakase/kazehakase_cvs.bb 1b5a8edcf4a52f628f27e5e38dff856525b60edc
@@ -0,0 +1,18 @@
+DESCRIPTION = "A gtk-webcore based browser"
+HOMEPAGE = "http://kazehakase.sourceforge.jp/"
+SECTION = "x11/network"
+LICENSE = "GPLv2"
+DEPENDS = "osb-nrcit glib-2.0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/kazehakase;module=kazehakase"
+S = "${WORKDIR}/kazehakase"
+
+
+PV = "0.4.7+cvs${SRCDATE}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --disable-gtkmozembed "
+
+DEFAULT_PREFERENCE = "-1"
+
============================================================
--- packages/slugos-init/files/boot/kexec b1ddcced6d9e71541270a6164d283c40b6bf4c53
+++ packages/slugos-init/files/boot/kexec b1ddcced6d9e71541270a6164d283c40b6bf4c53
@@ -0,0 +1,159 @@
+#!/bin/sh
+#
+# Loads the specified kernel and kexecs it.
+#
+# The access method and path from which to fetch the kernel
+# is specified in "$1" and "$2":
+#
+# flash /boot/zImage-ixp4xxbe
+# nfs spike:/home/slug/vmlinuz
+# wget http://devserv/kernels/vmlinuzbe
+# wget ftp://ftpserv/pub/zImage
+# /dev/sda1 /kernels/zImage-test
+# UUID /kernels/zImage-test
+#
+# Command-line options for the new kernel are in "$3".
+
+# Use the standard init path (see /etc/init.d/rcS)
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# Wait at least a short while for the disks...
+if [ ! "$sleep" -gt 0 ] ; then
+ sleep=1
+fi
+
+# Load the helper functions
+. /etc/default/functions
+. /etc/default/modulefunctions
+
+leds boot system
+
+if [ -n "$1" -a -n "$2" ] ; then
+
+ method="$1"
+ shift
+ kpath="$1"
+ shift
+ if [ -n "$1" ] ; then
+ kcmdline="$1"
+ shift
+ fi
+ kexec_image=
+ need_umount=0
+ do_kexec=0
+
+ mount -t proc proc /proc
+
+ case "$method" in
+
+ flash )
+ echo "Loading kexec kernel directly from \"$kpath\"..."
+ kexec_image="$kpath"
+ ;;
+
+ wget )
+ if /boot/network ; then
+ echo "mounting tmpfs partition..."
+ if mount -t tmpfs tmpfs /mnt ; then
+ need_umount=1
+ echo "Loading kexec kernel using wget \"$kpath\"..."
+ wget -P /mnt "$kpath"
+ t=`basename "$kpath"`
+ kexec_image="/mnt/$t"
+ fi
+ fi
+ ;;
+
+ nfs )
+ if /boot/network ; then
+ echo "Loading kexec kernel using nfs \"$kpath\"..."
+ echo "mounting nfs partition..."
+ if mount -o ro,nolock -t nfs `dirname "$kpath"` /mnt ; then
+ need_umount=1
+ t=`basename "$kpath"`
+ kexec_image="/mnt/$t"
+ fi
+ fi
+ ;;
+
+ /dev/* )
+ echo "Loading kexec kernel using disk \"$kpath\"..."
+ loaddiskmods
+ sleep "$sleep"
+ echo "mounting partition \"$method\"..."
+ if mount -o ro "$method" /mnt ; then
+ need_umount=1
+ kexec_image="/mnt/$kpath"
+ fi
+ ;;
+
+ UUID )
+ echo "Loading kexec kernel using disk UUID \"$kpath\"..."
+ loaddiskmods
+ sleep "$sleep"
+ if [ -n "$UUID" ] ; then
+ echo "mounting partition UUID \"$UUID\"..."
+ if mount -o ro -U "$UUID" /mnt ; then
+ need_umount=1
+ kexec_image="/mnt/$kpath"
+ fi
+ fi
+ ;;
+
+ * )
+ echo "Unrecognized method: \"$method\""
+ ;;
+
+ esac
+
+ if [ -n "$kexec_image" -a -f "$kexec_image" ] ; then
+ if kexec -l "$kexec_image" ; then
+ do_kexec=1
+ fi
+ else
+ echo "Unable to load \"$kexec_image\""
+ fi
+
+ if [ $do_kexec -eq 1 -a -n "$kcmdline" ] ; then
+ echo "Attempting to mount /sys (sysfs)..."
+ if mount -t sysfs sysfs /sys ; then
+ echo "Setting command line:"
+ echo " \"$kcmdline\""
+ echo "$kcmdline" > /sys/kernel/kexec_cmdline
+ echo "unmounting /sys..."
+ umount /sys
+ else
+ do_kexec=0
+ fi
+ fi
+
+ if [ $need_umount -eq 1 ] ; then
+ echo "unmounting /mnt..."
+ umount /mnt
+ fi
+
+ if [ $do_kexec -eq 1 ] ; then
+ echo "Remounting root as read-only..."
+ mount -o remount,ro /
+ echo "Invoking \"kexec -f -e\" ..."
+ kexec -f -e
+ echo "ERROR!"
+ # We should never return here! At this point, things are not
+ # too well. Remount the root as rw, and fallback.
+ echo "Remounting root as read-write..."
+ mount -o remount,rw /
+ fi
+else
+ echo "Usage: $0 flash|nfs|wget|UUID|/dev/<partition> <path-or-URL> [cmdline]"
+fi
+
+# fallback - use the flash boot
+echo "Falling back to flash boot..."
+leds beep -f 1000 -r 2
+exec /boot/flash
+
+# fallback to the fallback
+leds boot system panic
+exec <>/dev/console >&0 2>&0
+test -x /bin/sh && exec /bin/sh
+exit 1
============================================================
--- conf/distro/angstrom-2007.1-legacy.conf 6881282904bf0d4a7ea3e5a985cd8f22862e4561
+++ conf/distro/angstrom-2007.1-legacy.conf c5b38dbf99bb41080ad1856aeae6bb5359c8d578
@@ -1,9 +1,9 @@
#this is a special version of angstrom for legacy (e.g. kernel 2.4) software
# that means:
# * no udev
# * no sysfs
# * no EABI for ARM
-require conf/distro/angstrom-2007.1-oabi.conf
+require conf/distro/angstrom-2007.1.conf
# We'll have to fill this in as we go.
============================================================
--- conf/distro/angstrom-2007.1.conf 59159a926215caee1cf37b3d07c5a4bcf28deb10
+++ conf/distro/angstrom-2007.1.conf 5f9d6cf541be67c463ff4f89b5de124a851e5dc5
@@ -13,7 +13,7 @@ require conf/distro/include/sane-srcdate
require conf/distro/include/sane-srcdates.inc
#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
require conf/distro/include/angstrom${ARM_ABI}.inc
#Images built can have to modes:
@@ -50,10 +50,12 @@ FEED_ARCH_c7x0 = "armv5te"
FEED_ARCH_akita = "armv5te"
FEED_ARCH_at91sam9263ek = "armv5te"
FEED_ARCH_c7x0 = "armv5te"
+FEED_ARCH_compulab-pxa270 = "armv5te"
FEED_ARCH_h2200 = "armv5te"
FEED_ARCH_h3900 = "armv5te"
FEED_ARCH_h4000 = "armv5te"
FEED_ARCH_h5000 = "armv5te"
+FEED_ARCH_htctornado = "armv5te"
FEED_ARCH_htcuniversal = "armv5te"
FEED_ARCH_hx2000 = "armv5te"
FEED_ARCH_hx4700 = "armv5te"
@@ -88,6 +90,7 @@ FEED_ARCH_simpad = "arm-oabi"
FEED_ARCH_h3600 = "arm-oabi"
FEED_ARCH_h3800 = "arm-oabi"
FEED_ARCH_simpad = "arm-oabi"
+FEED_ARCH_htcwallaby = "arm-oabi"
#Tweak packaging for strongarm machines since they can't use EABI
============================================================
--- conf/distro/include/angstrom-glibc.inc cb939b1a389e8b33c0bf4f658e709da4337a4add
+++ conf/distro/include/angstrom-glibc.inc c70c421338b418901a172a9210ea87a82ab763c0
@@ -1,9 +1,9 @@ PREFERRED_PROVIDER_virtual/libc ?= "glib
# glibc:
PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
PREFERRED_PROVIDER_virtual/libc ?= "glibc"
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
============================================================
--- conf/distro/include/angstrom-uclibc.inc 5976f51d1a203540984b37aea9a01200c509f145
+++ conf/distro/include/angstrom-uclibc.inc acd77cb1b7ff38f08af7ea0f756e371ee8730a48
@@ -7,7 +7,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
-TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad']]}"
+TARGET_OS_UC = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d) in ['bfin']]}"
#mess with compiler flags to use -Os instead of -O2
============================================================
--- conf/distro/include/sane-srcdates.inc b2c78cdbf95e8492c4d56dd1afcca640d4e1bf2e
+++ conf/distro/include/sane-srcdates.inc 211037ba3b8be809090a4a8d44a0ea8d709dae7e
@@ -43,7 +43,7 @@ SRCDATE_rosetta ?= "20060804"
# GPE
SRCDATE_dasher-gpe ?= "20060814"
SRCDATE_rosetta ?= "20060804"
-SRCDATE_gpesyncd ?= "20061128"
+SRCDATE_gpesyncd ?= "20070701"
# GNOME
SRCDATE_gconf-dbus ?= "20070512"
============================================================
--- conf/machine/a1200.conf a1f575e97dc9c4fbdf6631c1b6673bfad76ed0dd
+++ conf/machine/a1200.conf 4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,2 +1,5 @@
-WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Motorola EZX A1200,\n* because \
-of the similarities between A780 and A1200 series. Use MACHINE = \"a780\".\n*\n*\n')}"
+#@TYPE: Machine
+#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
+
+require conf/machine/include/motorola-ezx-base.inc
============================================================
--- conf/machine/a780.conf 0b4ea0352725660f6f5612a0c0cb267b0274953e
+++ conf/machine/a780.conf 4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,37 +1,5 @@
#@TYPE: Machine
#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
#@DESCRIPTION: Machine configuration for the Motorola GSM phones A1200, A780, E680, and E680i
+require conf/machine/include/motorola-ezx-base.inc
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
-
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
-
-EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
-#cat /proc/mtd
-#dev: size erasesize name
-#mtd0: 00020000 00008000 "Bootloader"
-#mtd1: 000e0000 00020000 "Kernel"
-#mtd2: 00580000 00020000 "VFM_Filesystem"
-#mtd3: 00020000 00020000 "Logo"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
-#the EZX phones need a userspace daemon to stop the BP from shutting down the phone
-MACHINE_EXTRA_RDEPENDS += "opentapi"
-
-ROOT_FLASH_SIZE = "24"
-
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-
-# Opentapi needs to be started very early so we need the mux devices in static /dev
-IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
- files/device_table-ezx.txt"
-
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-require conf/machine/include/tune-xscale.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
============================================================
--- conf/machine/e680.conf 987ace20df2d1dc626ea26f22b62e9dc7289adc5
+++ conf/machine/e680.conf 4655da015ab00543ff0e0ed4f6eb7dcff60b8d28
@@ -1,2 +1,5 @@
-WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Motorola EZX E680,\n* because \
-of the similarities between A780 and E680-clamshell series. Use MACHINE = \"a780\".\n*\n*\n')}"
+#@TYPE: Machine
+#@NAME: Motorola EZX A1200, Motorola EZX A780, Motorola EZX E680, Motorola EZX E680i
+#@DESCRIPTION: Machine configuration for%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list