From c164968b0c1b08a7d85c95d492f7ec562689873a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Jan 2011 12:57:04 +0100
Subject: use HOSTCFLAGS, avoid object file generation

---
 target/tools/mkfimage/Makefile      |   2 +-
 target/tools/mkfimage/mkfimage      | Bin 11901 -> 0 bytes
 target/tools/trx/Makefile           |   2 +-
 target/tools/uboot-mkimage/Makefile |   4 +---
 4 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100755 target/tools/mkfimage/mkfimage

diff --git a/target/tools/mkfimage/Makefile b/target/tools/mkfimage/Makefile
index 110fa96ea..82e645285 100644
--- a/target/tools/mkfimage/Makefile
+++ b/target/tools/mkfimage/Makefile
@@ -1,4 +1,4 @@
 include $(TOPDIR)/rules.mk
 
 all:
-	$(HOSTCC) -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c
+	$(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkfimage mkfimage.c
diff --git a/target/tools/mkfimage/mkfimage b/target/tools/mkfimage/mkfimage
deleted file mode 100755
index b4f82ee6d..000000000
Binary files a/target/tools/mkfimage/mkfimage and /dev/null differ
diff --git a/target/tools/trx/Makefile b/target/tools/trx/Makefile
index 8daf54e78..2def53424 100644
--- a/target/tools/trx/Makefile
+++ b/target/tools/trx/Makefile
@@ -1,4 +1,4 @@
 include $(TOPDIR)/rules.mk
 
 all:
-	$(HOSTCC) -o ${STAGING_HOST_DIR}/bin/trx trx.c
+	$(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/trx trx.c
diff --git a/target/tools/uboot-mkimage/Makefile b/target/tools/uboot-mkimage/Makefile
index 08506a5f8..c9d85a28e 100644
--- a/target/tools/uboot-mkimage/Makefile
+++ b/target/tools/uboot-mkimage/Makefile
@@ -1,6 +1,4 @@
 include $(TOPDIR)/rules.mk
 
 all:
-	$(HOSTCC) -c crc32.c -o crc32.o
-	$(HOSTCC) -c mkimage.c -o mkimage.o
-	$(HOSTCC) -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.o crc32.o
+	$(HOSTCC) ${HOSTCFLAGS} -o ${STAGING_HOST_DIR}/bin/mkimage mkimage.c crc32.c
-- 
cgit v1.2.3


From 86aec5ee4d126d7ba2220e66819270985a97cfa5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Jan 2011 20:34:21 +0100
Subject: be sure EHCI module is loaded before OHCI/UHCI

---
 mk/modules.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mk/modules.mk b/mk/modules.mk
index ec026182a..1b8f5490b 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1183,6 +1183,10 @@ $(eval $(call KMOD_template,USB,usb,\
 ,50))
 endif
 
+$(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\
+	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \
+,55))
+
 $(eval $(call KMOD_template,USB_OHCI_HCD,usb-ohci-hcd,\
 	$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd \
 ,60))
@@ -1191,10 +1195,6 @@ $(eval $(call KMOD_template,USB_UHCI_HCD,usb-uhci-hcd,\
 	$(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd \
 ,60))
 
-$(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\
-	$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \
-,60))
-
 $(eval $(call KMOD_template,USB_ACM,usb-acm,\
 	$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm \
 ,70))
-- 
cgit v1.2.3


From fd5c3b9c4adb01bf350b781498b4c9614f40dcf8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Jan 2011 20:35:05 +0100
Subject: enable ACPI for ALIX1c board.

This is required for correct IRQ routing. After this MFGPT get its
interrupt 7 and the watchdog works fine. Bug closed.
---
 TODO                                      | 1 -
 target/config/Config.in                   | 2 +-
 target/x86/sys-available/pcengines-alix1c | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index f69bcf253..6e95a3ff7 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,5 @@
 - adkinstall with NTP and hwclock support
 - PKG_CONFLICTS for python/python2, is this possible with Kconfig?
 - mirror only option, for no internet access
-- fix watchdog for alix1c (mfgpt timer problem)
 - add support for brcm 2.6 (lzma/flash/wireless support)
 - help text for config/ needs adoption
diff --git a/target/config/Config.in b/target/config/Config.in
index 42e891cba..0021ee4bf 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -167,7 +167,7 @@ config ADK_TARGET_CFLAGS
 config ADK_TARGET_CMDLINE
 	string
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
-	default "console=ttyS0,115200 console=tty0 irqpoll geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
+	default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
 	default "console=ttyS0,115200"
 
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index 77802ea4d..17e5ea27e 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/target/x86/sys-available/pcengines-alix1c
@@ -4,6 +4,8 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_pcengines_alix1c
 	select ADK_CPU_GEODE
 	select ADK_KERNEL_MGEODE_LX
+	select ADK_KERNEL_PM
+	select ADK_KERNEL_ACPI
 	select ADK_TARGET_CPU_WITH_3DNOW
         select ADK_TARGET_CPU_WITH_3DNOWEXT
         select ADK_TARGET_CPU_WITH_MMX
@@ -16,6 +18,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_CF
+	select ADK_TARGET_WITH_WATCHDOG
 	help
          System profile for PCEngines ALIX1C. 
 
-- 
cgit v1.2.3


From 33c84781ec8c0225472bd1bf00184efcdff3c20b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Jan 2011 20:40:05 +0100
Subject: use /sbin for watchdog binary

---
 package/busybox/Makefile             | 2 +-
 package/busybox/files/watchdog.init  | 4 ++--
 package/watchdog/Makefile            | 8 ++++----
 package/watchdog/files/watchdog.init | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 46752cb72..6145cb780 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.18.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f15fe752d8b7012aa5e59f83b88ccb1c
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init
index 5fadef046..1f1724da5 100644
--- a/package/busybox/files/watchdog.init
+++ b/package/busybox/files/watchdog.init
@@ -10,10 +10,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	/usr/sbin/watchdog $watchdog_flags /dev/watchdog
+	/sbin/watchdog $watchdog_flags /dev/watchdog
 	;;
 stop)
-	kill $(pgrep -f /usr/sbin/watchdog)
+	kill $(pgrep -f /sbin/watchdog)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index b1813a044..b2c4839f7 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		watchdog
 PKG_VERSION:=		5.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		31766450ecfc9aff70fe966c0b9df06d
 PKG_DESCR:=		watchdog daemon
 PKG_SECTION:=		utils
@@ -16,9 +16,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
-	${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/
+	${INSTALL_DIR} ${IDIR_WATCHDOG}/sbin ${IDIR_WATCHDOG}/etc/
 	${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \
-		       ${IDIR_WATCHDOG}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/sbin/watchdog \
+		       ${IDIR_WATCHDOG}/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/watchdog/files/watchdog.init b/package/watchdog/files/watchdog.init
index 6e104fbcf..60805546d 100644
--- a/package/watchdog/files/watchdog.init
+++ b/package/watchdog/files/watchdog.init
@@ -11,10 +11,10 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	/usr/sbin/watchdog
+	/sbin/watchdog
 	;;
 stop)
-	kill $(pgrep -f /usr/sbin/watchdog)
+	kill $(pgrep -f /sbin/watchdog)
   	;;
 restart)
 	sh $0 stop
-- 
cgit v1.2.3


From eff46cfd9bcbd102695ce1b9bc9382cf12e7f221 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Jan 2011 20:51:26 +0100
Subject: be quiet on filesystem creation

---
 package/adkinstall/Makefile       | 2 +-
 package/adkinstall/src/adkinstall | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index d4202d78a..cb2d8002c 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		adkinstall
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		7
+PKG_RELEASE:=		8
 PKG_DESCR:=		openadk installer
 PKG_SECTION:=		base
 PKG_DEPENDS:=		parted sfdisk e2fsprogs
diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall
index b9b0e3109..2f14d0b96 100644
--- a/package/adkinstall/src/adkinstall
+++ b/package/adkinstall/src/adkinstall
@@ -54,16 +54,16 @@ if [ $rescue -eq 1 ];then
 	start=2
 	parted -s /dev/sda unit cyl mkpart primary ext2 0 1
 	check_exit
-	mke2fs /dev/sda1
+	mke2fs -q /dev/sda1
 	check_exit
 	parted -s /dev/sda unit cyl mkpart primary ext2 1 2
 	check_exit
-	mke2fs /dev/sda2
+	mke2fs -q /dev/sda2
 	check_exit
 fi
 parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize
 check_exit
-mke2fs /dev/sda1
+mke2fs -q /dev/sda1
 check_exit
 parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize
 check_exit
-- 
cgit v1.2.3


From 9d40adece525b0989001e3a8f486e76b3996f8e5 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Jan 2011 20:58:20 +0100
Subject: fix recognition of BSD stat. now busybox stat works, too.

---
 scripts/install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index 8eb6ee062..7b3b5bc4d 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -201,10 +201,10 @@ if (( cyls < (cfgfs + 2) )); then
 	exit 1
 fi
 
-if stat --help >/dev/null 2>&1; then
-	statcmd='stat -c %s'	# GNU stat
-else
+if stat -qs .>/dev/null 2>&1; then
 	statcmd='stat -f %z'	# BSD stat (or so we assume)
+else
+	statcmd='stat -c %s'	# GNU stat
 fi
 
 if ! T=$(mktemp -d /tmp/openadk.XXXXXXXXXX); then
-- 
cgit v1.2.3


From 4f3783df6a6af03fa1b672b936d45d601512ae6d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 1 Jan 2011 21:00:39 +0100
Subject: alix1c is bootable via USB stick

---
 target/config/Config.in                   | 1 +
 target/x86/sys-available/pcengines-alix1c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/target/config/Config.in b/target/config/Config.in
index 0021ee4bf..42e9a65ef 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -330,6 +330,7 @@ config ADK_TARGET_ROOTFS_USB
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_USB
 	select ADK_KERNEL_USB_EHCI_HCD
+	select ADK_KERNEL_USB_OHCI_HCD
 	select ADK_KERNEL_USB_UHCI_HCD
 	select ADK_KERNEL_USB_STORAGE
 	select ADK_KERNEL_EXT2_FS
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index 17e5ea27e..4024ecb90 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/target/x86/sys-available/pcengines-alix1c
@@ -19,6 +19,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_WATCHDOG
+	select ADK_TARGET_WITH_USB_BOOT
 	help
          System profile for PCEngines ALIX1C. 
 
-- 
cgit v1.2.3