| Message ID | 1498478144-7365-1-git-send-email-rjangir@codeaurora.org |
|---|---|
| State | Changes Requested |
| Headers | show |
On Mon, Jun 26, 2017 at 6:55 AM, Ram Chandra Jangir <rjangir@codeaurora.org> wrote: > IPQ806x AP148 and DB149 boards didn't have the UCI ubootenv > section initialized, so the usage of fw_printenv required manual > configuration. With this change, the "fw_printenv" and "fw_setenv" > command will automatically work on NOR and NAND based platforms. > > Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org> > --- > package/boot/uboot-envtools/files/ipq | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/package/boot/uboot-envtools/files/ipq b/package/boot/uboot-envtools/files/ipq > index 16c7ba6..01ae220 100644 > --- a/package/boot/uboot-envtools/files/ipq > +++ b/package/boot/uboot-envtools/files/ipq > @@ -13,7 +13,29 @@ touch /etc/config/ubootenv > > board=$(ipq806x_board_name) > > +default_uboot_env () { Is there a better name for this? It's really just for boards that can boot NOR or NAND to decide where the env is? > + UBOOTENV_PART=$(cat /proc/mtd | grep APPSBLENV) > + mtd_dev=$(echo $UBOOTENV_PART | awk '{print $1}' | sed 's/:$//') > + mtd_size=0x$(echo $UBOOTENV_PART | awk '{print $2}') > + mtd_erase=0x$(echo $UBOOTENV_PART | awk '{print $3}') > + nor_flash=`find /sys/bus/spi/devices/*/mtd -name ${mtd_dev}` Can you stick with one syntax here? $(...) > + > + if [ -n "$nor_flash" ]; then > + uboot_env_size=$mtd_size > + else > + # size is fixed to 0x40000 in u-boot > + uboot_env_size=0x40000 > + fi > + > + sectors=$(( $uboot_env_size / $mtd_erase )) > + echo /dev/$mtd_dev 0x0 $uboot_env_size $mtd_erase $sectors > +} > + > case "$board" in > +ap148 | db149) > + env=$(default_uboot_env) > + [ -n "${env}" ] && ubootenv_add_uci_config $env When is it ever not defined? > + ;; > ea8500) > ubootenv_add_uci_config "/dev/mtd10" "0x0" "0x20000" "0x20000" > ;; > -- > 2.7.2 > > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev
Thanks Matt for the review, On Tue, Jun 27, 2017 8:05 PM, Matthew McClintock <msm-oss@mcclintock.net> wrote: >On Mon, Jun 26, 2017 at 6:55 AM, Ram Chandra Jangir <rjangir@codeaurora.org> wrote: > IPQ806x AP148 and DB149 boards didn't have the UCI ubootenv section > initialized, so the usage of fw_printenv required manual > configuration. With this change, the "fw_printenv" and "fw_setenv" > command will automatically work on NOR and NAND based platforms. > > Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org> > --- > package/boot/uboot-envtools/files/ipq | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/package/boot/uboot-envtools/files/ipq > b/package/boot/uboot-envtools/files/ipq > index 16c7ba6..01ae220 100644 > --- a/package/boot/uboot-envtools/files/ipq > +++ b/package/boot/uboot-envtools/files/ipq > @@ -13,7 +13,29 @@ touch /etc/config/ubootenv > > board=$(ipq806x_board_name) > > +default_uboot_env () { >Is there a better name for this? It's really just for boards that can boot NOR or NAND to decide where the env is? Thanks, Yeah I think I can rename it as ubootenv_mtdinfo(), please let me know if any other suggestion is there. > + UBOOTENV_PART=$(cat /proc/mtd | grep APPSBLENV) > + mtd_dev=$(echo $UBOOTENV_PART | awk '{print $1}' | sed 's/:$//') > + mtd_size=0x$(echo $UBOOTENV_PART | awk '{print $2}') > + mtd_erase=0x$(echo $UBOOTENV_PART | awk '{print $3}') > + nor_flash=`find /sys/bus/spi/devices/*/mtd -name ${mtd_dev}` >Can you stick with one syntax here? $(...) Sure, will update in next patch. > + > + if [ -n "$nor_flash" ]; then > + uboot_env_size=$mtd_size > + else > + # size is fixed to 0x40000 in u-boot > + uboot_env_size=0x40000 > + fi > + > + sectors=$(( $uboot_env_size / $mtd_erase )) > + echo /dev/$mtd_dev 0x0 $uboot_env_size $mtd_erase $sectors } > + > case "$board" in > +ap148 | db149) > + env=$(default_uboot_env) > + [ -n "${env}" ] && ubootenv_add_uci_config $env >When is it ever not defined? Right, this seems to be unnecessary here, I will clean up this in next patch. > + ;; > ea8500) > ubootenv_add_uci_config "/dev/mtd10" "0x0" "0x20000" "0x20000" > ;; > -- > 2.7.2 > > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev
diff --git a/package/boot/uboot-envtools/files/ipq b/package/boot/uboot-envtools/files/ipq index 16c7ba6..01ae220 100644 --- a/package/boot/uboot-envtools/files/ipq +++ b/package/boot/uboot-envtools/files/ipq @@ -13,7 +13,29 @@ touch /etc/config/ubootenv board=$(ipq806x_board_name) +default_uboot_env () { + UBOOTENV_PART=$(cat /proc/mtd | grep APPSBLENV) + mtd_dev=$(echo $UBOOTENV_PART | awk '{print $1}' | sed 's/:$//') + mtd_size=0x$(echo $UBOOTENV_PART | awk '{print $2}') + mtd_erase=0x$(echo $UBOOTENV_PART | awk '{print $3}') + nor_flash=`find /sys/bus/spi/devices/*/mtd -name ${mtd_dev}` + + if [ -n "$nor_flash" ]; then + uboot_env_size=$mtd_size + else + # size is fixed to 0x40000 in u-boot + uboot_env_size=0x40000 + fi + + sectors=$(( $uboot_env_size / $mtd_erase )) + echo /dev/$mtd_dev 0x0 $uboot_env_size $mtd_erase $sectors +} + case "$board" in +ap148 | db149) + env=$(default_uboot_env) + [ -n "${env}" ] && ubootenv_add_uci_config $env + ;; ea8500) ubootenv_add_uci_config "/dev/mtd10" "0x0" "0x20000" "0x20000" ;;
IPQ806x AP148 and DB149 boards didn't have the UCI ubootenv section initialized, so the usage of fw_printenv required manual configuration. With this change, the "fw_printenv" and "fw_setenv" command will automatically work on NOR and NAND based platforms. Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org> --- package/boot/uboot-envtools/files/ipq | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)