I noticed most of /etc/defconfig was replaced by /etc/uci-defaults, which is
indeed much nicer. So I moved over ubootenv from having a defconfig-entry to
also be generated from uci-defaults.

/etc/defconfig/all0258n can be removed after this patch was applied.

Signed-off-by: Daniel Golle <[email protected]>

Index: target/linux/ar71xx/base-files/etc/defconfig/all0258n/ubootenv
===================================================================
--- target/linux/ar71xx/base-files/etc/defconfig/all0258n/ubootenv      
(revision 28855)
+++ target/linux/ar71xx/base-files/etc/defconfig/all0258n/ubootenv      
(working copy)
@@ -1,5 +0,0 @@
-config ubootenv
-       option dev      /dev/mtd1
-       option offset   0x0
-       option envsize  0x10000
-       option secsize  0x10000
Index: target/linux/ar71xx/base-files/etc/uci-defaults/ubootenv
===================================================================
--- target/linux/ar71xx/base-files/etc/uci-defaults/ubootenv    (revision 0)
+++ target/linux/ar71xx/base-files/etc/uci-defaults/ubootenv    (revision 0)
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+#
+
+add_ubootenv() {
+       local dev=$1
+       local offset=$2
+       local envsize=$3
+       local secsize=$4
+       local numsec=$5
+       uci batch <<EOF
+add ubootenv ubootenv
+set ubootenv.@ubootenv[-1].dev='$dev'
+set ubootenv.@ubootenv[-1].offset='$offset'
+set ubootenv.@ubootenv[-1].envsize='$envsize'
+set ubootenv.@ubootenv[-1].secsize='$secsize'
+set ubootenv.@ubootenv[-1].numsec='$numsec'
+EOF
+}
+
+[ -e /etc/config/ubootenv ] && exit 0
+
+touch /etc/config/ubootenv
+
+. /lib/ar71xx.sh
+
+board=$(ar71xx_board_name)
+
+case "$board" in
+all0258n)
+       add_ubootenv /dev/mtd1 0x0 0x10000 0x10000
+       ;;
+
+esac
+
+uci commit ubootenv

Property changes on: target/linux/ar71xx/base-files/etc/uci-defaults/ubootenv
___________________________________________________________________
Added: svn:executable
   + *

_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to