omap24xx: Move p54 eeprom init to preinit
authorMichael Büsch <mb@bu3sch.de>
Sat, 29 Jan 2011 18:45:28 +0000 (18:45 +0000)
committerMichael Büsch <mb@bu3sch.de>
Sat, 29 Jan 2011 18:45:28 +0000 (18:45 +0000)
SVN-Revision: 25242

target/linux/omap24xx/base-files/etc/init.d/p54spi-eeprom [deleted file]
target/linux/omap24xx/base-files/lib/preinit/99_p54spi_eeprom [new file with mode: 0644]

diff --git a/target/linux/omap24xx/base-files/etc/init.d/p54spi-eeprom b/target/linux/omap24xx/base-files/etc/init.d/p54spi-eeprom
deleted file mode 100755 (executable)
index 5c056a9..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=30
-
-start() {
-       [ -e /lib/firmware/3826.eeprom ] && return 0
-
-       [ -x /usr/bin/calvaria ] || { echo "p54spi EEPROM: calvaria not found"; return 1; }
-       [ -x /usr/bin/cal2p54 ] || { echo "p54spi EEPROM: cal2p54 not found"; return 1; }
-
-       /usr/bin/calvaria -p -n wlan-iq-align -i last /dev/mtdblock1 >/tmp/wlan-iq-align || {
-               echo "p54spi EEPROM: Failed to extract wlan-iq-align"
-               return 1
-       }
-       /usr/bin/calvaria -p -n wlan-tx-gen2 -i last /dev/mtdblock1 >/tmp/txgen_file || {
-               echo "p54spi EEPROM: Failed to extract wlan-tx-gen2"
-               return 1
-       }
-
-       /usr/bin/cal2p54 /tmp/txgen_file /tmp/wlan-iq-align >/lib/firmware/3826.eeprom || {
-               echo "p54spi EEPROM: Failed to generate EEPROM"
-               return 1
-       }
-
-       rm -f /tmp/wlan-iq-align /tmp/txgen_file
-}
diff --git a/target/linux/omap24xx/base-files/lib/preinit/99_p54spi_eeprom b/target/linux/omap24xx/base-files/lib/preinit/99_p54spi_eeprom
new file mode 100644 (file)
index 0000000..cd406f4
--- /dev/null
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+do_generate_p54spi_eeprom() {
+       [ -e /lib/firmware/3826.eeprom ] && return 0
+
+       [ -x /usr/bin/calvaria ] || { echo "p54spi EEPROM: calvaria not found"; return 1; }
+       [ -x /usr/bin/cal2p54 ] || { echo "p54spi EEPROM: cal2p54 not found"; return 1; }
+
+       /usr/bin/calvaria -p -n wlan-iq-align -i last /dev/mtdblock1 >/tmp/wlan-iq-align || {
+               echo "p54spi EEPROM: Failed to extract wlan-iq-align"
+               return 1
+       }
+       /usr/bin/calvaria -p -n wlan-tx-gen2 -i last /dev/mtdblock1 >/tmp/txgen_file || {
+               echo "p54spi EEPROM: Failed to extract wlan-tx-gen2"
+               return 1
+       }
+
+       /usr/bin/cal2p54 /tmp/txgen_file /tmp/wlan-iq-align >/lib/firmware/3826.eeprom || {
+               echo "p54spi EEPROM: Failed to generate EEPROM"
+               return 1
+       }
+
+       rm -f /tmp/wlan-iq-align /tmp/txgen_file
+}
+
+boot_hook_add preinit_mount_root do_generate_p54spi_eeprom