diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-07-18 14:59:48 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-07-27 12:10:45 +0200 |
| commit | 8126e572dd4f531c5f105b7197bc119b2b1ebb07 (patch) | |
| tree | d60027268c4c4f15cf52ad97f5993e81d0848454 /target/linux/imx6/base-files/lib/preinit | |
| parent | 0f3c3a5fb2738b25c62eb0ff8ef7d0654c0b9300 (diff) | |
| download | upstream-8126e572dd4f531c5f105b7197bc119b2b1ebb07.tar.gz upstream-8126e572dd4f531c5f105b7197bc119b2b1ebb07.tar.bz2 upstream-8126e572dd4f531c5f105b7197bc119b2b1ebb07.zip | |
imx6: use device-tree compatible for board name
In imx6, we currently use the model from DTS to derive a board name
manually in /lib/imx6.sh.
However, if we have individual DTS files anyway, we can exploit
generic 02_sysinfo and use the compatible as board name directly.
While at it, remove the wildcards from /lib/upgrade/platform.sh as
these might make code shorter, but are quite unpleasant when grepping
for a specific device.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/imx6/base-files/lib/preinit')
| -rw-r--r-- | target/linux/imx6/base-files/lib/preinit/01_sysinfo | 7 | ||||
| -rw-r--r-- | target/linux/imx6/base-files/lib/preinit/79_move_config | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/imx6/base-files/lib/preinit/01_sysinfo b/target/linux/imx6/base-files/lib/preinit/01_sysinfo deleted file mode 100644 index 73f9e596b2..0000000000 --- a/target/linux/imx6/base-files/lib/preinit/01_sysinfo +++ /dev/null @@ -1,7 +0,0 @@ -do_sysinfo_imx6() { - . /lib/imx6.sh - - imx6_board_detect -} - -boot_hook_add preinit_main do_sysinfo_imx6 diff --git a/target/linux/imx6/base-files/lib/preinit/79_move_config b/target/linux/imx6/base-files/lib/preinit/79_move_config index 7e30292049..baa7ffe44b 100644 --- a/target/linux/imx6/base-files/lib/preinit/79_move_config +++ b/target/linux/imx6/base-files/lib/preinit/79_move_config @@ -6,7 +6,9 @@ move_config() { local board=$(board_name) case "$board" in - apalis*) + toradex,apalis_imx6q-eval |\ + toradex,apalis_imx6q-ixora |\ + toradex,apalis_imx6q-ixora-v1.1 ) if [ -b $(bootpart_from_uuid) ]; then apalis_mount_boot [ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" / |