Linux 3.3 will include 3 patches I've contributed including a significant
rewrite of the alix2 driver, plus geos and net5501 platform drivers.
This prepares OpenWRT for these changes to come downstream.
Signed-off-by: Philip Prindeville <[email protected]>
Index: target/linux/x86/alix2/config-default
===================================================================
--- target/linux/x86/alix2/config-default (revision 29805)
+++ target/linux/x86/alix2/config-default (working copy)
@@ -22,3 +22,6 @@
# CONFIG_CS5535_CLOCK_EVENT_SRC is not set
CONFIG_PATA_CS5536=y
CONFIG_ALIX=y
+CONFIG_DMI=y
+# CONFIG_DMI_SYSFS is not set
+# CONFIG_DMIID is not set
Index: target/linux/x86/config-default
===================================================================
--- target/linux/x86/config-default (revision 29805)
+++ target/linux/x86/config-default (working copy)
@@ -455,4 +455,6 @@
# CONFIG_BATTERY_BQ20Z75 is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_ALIX is not set
+# CONFIG_GEOS is not set
+# CONFIG_NET5501 is not set
# CONFIG_SAMSUNG_Q10 is not set
Index: target/linux/x86/geos/config-default
===================================================================
--- target/linux/x86/geos/config-default (revision 29805)
+++ target/linux/x86/geos/config-default (working copy)
@@ -1,32 +1,27 @@
# CONFIG_ACPI is not set
CONFIG_DMI=y
CONFIG_DMIID=y
+CONFIG_PROCESSOR_SELECT=y
CONFIG_CPU_SUP_AMD=y
-CONFIG_GEODE_MFGPT_TIMER=y
-# CONFIG_GEODE_WDT is not set
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_GENERIC_GPIO=y
CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_ISA is not set
-# CONFIG_INPUT is not set
-# CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_M486 is not set
CONFIG_MGEODE_LX=y
# CONFIG_MOUSE_PS2 is not set
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCSPKR_PLATFORM=y
-CONFIG_PROCESSOR_SELECT=y
# CONFIG_SCx200 is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
CONFIG_X86_DEBUGCTLMSR=y
-# CONFIG_X86_DS is not set
# CONFIG_X86_GENERIC is not set
CONFIG_X86_INTERNODE_CACHE_SHIFT=5
CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_TSC=y
-CONFIG_X86_USE_3DNOW=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_GPIOLIB=y
# CONFIG_CS5535_CLOCK_EVENT_SRC is not set
CONFIG_PATA_CS5536=y
+CONFIG_GEOS=y
Index: target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot
===================================================================
--- target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot
(revision 0)
+++ target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot
(revision 0)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+logger -t button -p daemon.info "$BUTTON/$ACTION"
+
+case "$BUTTON/$ACTION" in
+
+reset/released)
+ reboot -f
+ ;;
+
+esac
+
+exit 0
Property changes on:
target/linux/x86/geos/base-files/etc/hotplug.d/button/50-reboot
___________________________________________________________________
Added: svn:executable
+ *
Index: target/linux/x86/geos/base-files/etc/config/system
===================================================================
--- target/linux/x86/geos/base-files/etc/config/system (revision 0)
+++ target/linux/x86/geos/base-files/etc/config/system (revision 0)
@@ -0,0 +1,27 @@
+
+config system
+ option hostname OpenWrt
+ option timezone UTC
+
+config rdate
+ option interface wan
+
+config led
+ option default 0
+ option name LAN
+ option sysfs 'geos:1'
+ option trigger netdev
+ option mode 'tx rx'
+ option dev 'br-lan'
+
+config led
+ option default 0
+ option name WiFi
+ option sysfs 'geos:2'
+ option trigger 'phy0tpt'
+
+config led
+ option default 0
+ option name Health
+ option sysfs 'geos:3'
+ option trigger 'heartbeat'
Index: target/linux/x86/geos/target.mk
===================================================================
--- target/linux/x86/geos/target.mk (revision 29805)
+++ target/linux/x86/geos/target.mk (working copy)
@@ -15,6 +15,10 @@
kmod-cfg80211 kmod-mac80211 \
kmod-mppe kmod-pppoe kmod-pppoa kmod-pppol2tp \
kmod-ath kmod-ath5k kmod-ath9k \
+ kmod-leds-gpio kmod-input-gpio-keys-polled \
+ kmod-button-hotplug \
+ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
+ kmod-ledtrig-netdev kmod-ledtrig-netfilter \
kmod-cpu-msr \
soloscli linux-atm br2684ctl bridge ppp ppp-mod-pppoa \
pppdump pppstats \
Index: target/linux/x86/net5501/config-default
===================================================================
--- target/linux/x86/net5501/config-default (revision 29805)
+++ target/linux/x86/net5501/config-default (working copy)
@@ -1,42 +1,24 @@
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_PROCESSOR_SELECT=y
CONFIG_CPU_SUP_AMD=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_GENERIC_GPIO=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
-CONFIG_HAVE_EARLY_RES=y
-CONFIG_HAVE_HW_BREAKPOINT=y
-CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
-CONFIG_HAVE_OPTPROBES=y
+CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_GENERIC_GPIO=y
CONFIG_HWMON=y
# CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_INSTRUCTION_DECODER=y
-CONFIG_ISA_DMA_API=y
-CONFIG_K8_NB=y
-# CONFIG_LEDS_GPIO is not set
# CONFIG_M486 is not set
CONFIG_MGEODE_LX=y
-CONFIG_GEODE_MFGPT_TIMER=y
-# CONFIG_NEED_DMA_MAP_STATE is not set
-CONFIG_NEED_SG_DMA_LENGTH=y
+# CONFIG_MOUSE_PS2 is not set
# CONFIG_PCIEPORTBUS is not set
-# CONFIG_PCSPKR_PLATFORM is not set
-CONFIG_PERF_EVENTS=y
-CONFIG_PROCESSOR_SELECT=y
-CONFIG_SCSI_MOD=y
+CONFIG_PCSPKR_PLATFORM=y
# CONFIG_SCx200 is not set
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_TINY_RCU is not set
-CONFIG_X86_CMOV=y
CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_GENERIC is not set
CONFIG_X86_INTERNODE_CACHE_SHIFT=5
CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_TSC=y
-CONFIG_X86_USE_3DNOW=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
+# CONFIG_CS5535_CLOCK_EVENT_SRC is not set
+CONFIG_PATA_CS5536=y
+CONFIG_NET5501=y
Index: target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot
===================================================================
--- target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot
(revision 0)
+++ target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot
(revision 0)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+logger -t button -p daemon.info "$BUTTON/$ACTION"
+
+case "$BUTTON/$ACTION" in
+
+reset/released)
+ reboot -f
+ ;;
+
+esac
+
+exit 0
Property changes on:
target/linux/x86/net5501/base-files/etc/hotplug.d/button/50-reboot
___________________________________________________________________
Added: svn:executable
+ *
Index: target/linux/x86/net5501/base-files/etc/config/system
===================================================================
--- target/linux/x86/net5501/base-files/etc/config/system (revision 0)
+++ target/linux/x86/net5501/base-files/etc/config/system (revision 0)
@@ -0,0 +1,16 @@
+config system
+ option hostname OpenWrt
+ option timezone UTC
+
+config timeserver ntp
+ list server 0.openwrt.pool.ntp.org
+ list server 1.openwrt.pool.ntp.org
+ list server 2.openwrt.pool.ntp.org
+ list server 3.openwrt.pool.ntp.org
+
+config led
+ option default 1
+ option name Heartbeat
+ option sysfs 'net5501:1'
+ option trigger heartbeat
+
Index: target/linux/x86/net5501/base-files/etc/config/network
===================================================================
--- target/linux/x86/net5501/base-files/etc/config/network (revision 0)
+++ target/linux/x86/net5501/base-files/etc/config/network (revision 0)
@@ -0,0 +1,18 @@
+# Copyright (C) 2011 OpenWrt.org
+
+config interface loopback
+ option ifname lo
+ option proto static
+ option ipaddr 127.0.0.1
+ option netmask 255.0.0.0
+
+config interface lan
+ option ifname "eth1 eth2 eth3"
+ option type bridge
+ option proto static
+ option ipaddr 192.168.1.1
+ option netmask 255.255.255.0
+
+config interface wan
+ option ifname eth0
+ option proto dhcp
Index: target/linux/x86/net5501/target.mk
===================================================================
--- target/linux/x86/net5501/target.mk (revision 29805)
+++ target/linux/x86/net5501/target.mk (working copy)
@@ -1,13 +1,30 @@
BOARDNAME:=Soekris net5501
-FEATURES:=squashfs pci usb gpio
-DEFAULT_PACKAGES += kmod-ata-via-sata kmod-crypto-hw-geode \
- kmod-gpio-cs5535 kmod-gpio-nsc kmod-gpio-pc8736x \
- kmod-wdt-geode kmod-hwmon-core kmod-hwmon-pc87360 \
- kmod-via-rhine kmod-leds-net5501 \
+FEATURES:=squashfs jffs2 ext4 pci usb gpio
+NET5501_GPIO = $(if $(findstring
2.6.32,$(LINUX_VERSION)),gpio-cs5535,gpio-cs5535-new)
+DEFAULT_PACKAGES += kmod-crypto-hw-geode kmod-crypto-ocf \
+ kmod-$(NET5501_GPIO) kmod-gpio-nsc \
+ kmod-wdt-geode kmod-cs5535-clockevt kmod-cs5535-mfgpt \
+ kmod-cs5536 \
+ kmod-hwmon-core kmod-hwmon-pc87360 kmod-gpio-pc8736x \
+ kmod-via-rhine kmod-solos-pci \
kmod-i2c-core kmod-i2c-gpio \
kmod-i2c-algo-bit kmod-i2c-algo-pca kmod-i2c-algo-pcf \
- kmod-usb-core kmod-usb2 kmod-usb-uhci
+ kmod-i2c-scx200-acb \
+ kmod-usb-core kmod-usb2 kmod-usb-ohci \
+ kmod-cfg80211 kmod-mac80211 \
+ kmod-mppe kmod-pppoe kmod-pppoa kmod-pppo2ltp \
+ kmod-ath kmod-ath5k kmod-ath9k \
+ kmod-leds-gpio kmod-input-gpio-keys-polled \
+ kmod-button-hotplug \
+ kmod-ledtrig-heartbeat kmod-ledtrig-gpio \
+ kmod-ledtrig-netdev kmod-ledtrig-netfilter \
+ kmod-cpu-msr \
+ soloscli linux-atm br2684ctl bridge ppp ppp-mod-pppoa \
+ pppdump pppstats \
+ libopenssl ocf-crypto-headers zlib hwclock hostapd
+CS5535_MASK:=0x01000040
+
CFLAGS += -Os -pipe -march=k6-2 -fno-align-functions -fno-align-loops
-fno-align-jumps \
-fno-align-labels
@@ -15,3 +32,6 @@
Build firmware images for Soekris net5501 board
endef
+define KernelPackage/$(NET5501_GPIO)/install
+ sed -i -r -e 's/$$$$$$$$/ mask=$(CS5535_MASK)/'
$(1)/etc/modules.d/??-$(NET5501_GPIO)
+endef
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
