Merge branch 'master' of git+ssh://openadk.org/git/openadk

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

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))

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

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

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

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

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

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

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

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"
 
@@ -329,6 +329,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

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

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

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

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,8 @@ 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
+	select ADK_TARGET_WITH_USB_BOOT
 	help
          System profile for PCEngines ALIX1C.