Re: [LEDE-DEV] [RFC PATCH odhcpd] config: respect ignore uci option

[Karl Palsson]

Jo-Philipp Wich  wrote:
> The odhcpd documentation currently implies that "option ignore
> 1" in a section of type "dhcp" will disable any services on the
> referenced interface while the code actually ignores the
> setting when initializing referenced interfaces.
> 
> This commonly leads to situations where users think that
> "option disabled" will prevent any server activity on a given
> interface while in reality odhcpd effectively acts as rogue
> DHCPv6 server in its default configuration.
> 
> To fully inhibit any activity, one has to specify both "option
> ignore 1" as well as "option ra disabled", "option ndp
> disabled" and "option dhcpv6 disabled" which is highly counter
> intuitive at best.
> 
> A previous commit (5f425ed Respect interface "ignore" settings
> as documented.) attempted to address the problem by observing
> the value of i->ignore instead of unconditionally enabling all
> protocols but broke the ability to use DHCPv6 relay mode while
> having DHCPv4 disabled.
> 
> This patch changes ...
> 
>  - the enabling of services on an interface to use the value of the ignore
>option as default choice instead of hardcoding "true"
> 
>  - the options "ra", "ndp", "dhcpv4" and "dhcpv6" to take precedence over the
>default "ignore" state to allow selectively enabling services on ignored
>interfaces
> 
>  - the README to clarify the fact that "ra", "ndp", "dhcpv4" and "dhcpv6" can
>now override "option ignore"
> 
> Signed-off-by: Jo-Philipp Wich 
> ---

Acked-by: Karl Palsson 

Not tested, but I support a future where "ignore" ignores :)

signature.asc
Description: OpenPGP Digital Signature
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH v4 0/6] sunxi: rework image build and sysupgrade support

[Felix Fietkau]

On 2017-01-04 15:19, Yousong Zhou wrote:
> This series mainly tries achieve the following goals
> 
>  - use new image generation method
>  - squashfs sdcard image support
>  - mkfs.f2fs or mkfs.ext4 remaining space within squashfs rootfs partition and
>mount it as rw overlay
>  - sysupgrade with fwtool check support
> 
> Device profiles are automatically generated with a helper makefile.  Names for
> image files, board_names, etc. are changed to try to use basename of kernel 
> dts
> file for the specific device.
> 
> Run-tested with cubietech,cubieboard2, compile-tested others
Merged to my staging tree, thanks.

I made some modifications though:
Since patch 1 deletes an existing default profile and patch 6 adds a new
one, I've folded patch 6 into 1 and put patch 5 first (because of
dependencies).

- Felix

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH RFC 1/3] busybox: convert netmsg applet to "new style" applet definition

[Magnus Kroken]

The "new style" busybox applet approach moves all config
and build definitions related to  an applet to its .c file.

Signed-off-by: Magnus Kroken 
---
 .../busybox/patches/210-add_netmsg_util.patch  | 54 ++
 1 file changed, 15 insertions(+), 39 deletions(-)

diff --git a/package/utils/busybox/patches/210-add_netmsg_util.patch 
b/package/utils/busybox/patches/210-add_netmsg_util.patch
index 2382698..d7b2ae7 100644
--- a/package/utils/busybox/patches/210-add_netmsg_util.patch
+++ b/package/utils/busybox/patches/210-add_netmsg_util.patch
@@ -1,46 +1,25 @@
 a/include/applets.src.h
-+++ b/include/applets.src.h
-@@ -229,6 +229,7 @@ IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DRO
- IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))
- IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP))
- IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP))
-+IF_NETMSG(APPLET(netmsg, BB_DIR_BIN, BB_SUID_REQUIRE))
- IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP))
- IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP))
- IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP))
 a/networking/Config.src
-+++ b/networking/Config.src
-@@ -639,6 +639,12 @@ config FEATURE_IPCALC_LONG_OPTIONS
-   help
- Support long options for the ipcalc applet.
- 
-+config NETMSG
-+  bool "netmsg"
-+  default n
-+  help
-+simple program for sending udp broadcast messages
-+
- config NETSTAT
-   bool "netstat"
-   default y
 a/networking/Kbuild.src
-+++ b/networking/Kbuild.src
-@@ -27,6 +27,7 @@ lib-$(CONFIG_IP)   += ip.o
- lib-$(CONFIG_IPCALC)   += ipcalc.o
- lib-$(CONFIG_NAMEIF)   += nameif.o
- lib-$(CONFIG_NC)   += nc.o
-+lib-$(CONFIG_NETMSG)   += netmsg.o
- lib-$(CONFIG_NETSTAT)  += netstat.o
- lib-$(CONFIG_NSLOOKUP) += nslookup.o
- lib-$(CONFIG_NTPD) += ntpd.o
 --- /dev/null
 +++ b/networking/netmsg.c
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,76 @@
 +/*
 + * Copyright (C) 2006 Felix Fietkau 
 + *
 + * This is free software, licensed under the GNU General Public License v2.
 + */
++
++//config:config NETMSG
++//config: bool "netmsg"
++//config: default n
++//config: help
++//config:   simple program for sending udp broadcast messages
++
++//applet:IF_NETMSG(APPLET(netmsg, BB_DIR_BIN, BB_SUID_REQUIRE))
++
++//kbuild:lib-$(CONFIG_NETMSG) += netmsg.o
++
++//usage:#define netmsg_trivial_usage NOUSAGE_STR
++//usage:#define netmsg_full_usage ""
++
 +#include 
 +#include 
 +#include 
@@ -50,9 +29,6 @@
 +#include 
 +#include "busybox.h"
 +
-+//usage:#define netmsg_trivial_usage NOUSAGE_STR
-+//usage:#define netmsg_full_usage ""
-+
 +#ifndef CONFIG_NETMSG
 +int main(int argc, char **argv)
 +#else
-- 
2.1.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH RFC 2/3] busybox: convert lock applet to "new style" applet definitions

[Magnus Kroken]

Signed-off-by: Magnus Kroken 
---
 .../utils/busybox/patches/220-add_lock_util.patch  | 54 ++
 1 file changed, 15 insertions(+), 39 deletions(-)

diff --git a/package/utils/busybox/patches/220-add_lock_util.patch 
b/package/utils/busybox/patches/220-add_lock_util.patch
index c60f5db..4e46b74 100644
--- a/package/utils/busybox/patches/220-add_lock_util.patch
+++ b/package/utils/busybox/patches/220-add_lock_util.patch
@@ -1,46 +1,25 @@
 a/include/applets.src.h
-+++ b/include/applets.src.h
-@@ -196,6 +196,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN,
- IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP))
- IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
- IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
-+IF_LOCK(APPLET(lock, BB_DIR_BIN, BB_SUID_DROP))
- IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, 
logname))
- IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP))
- IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls))
 a/miscutils/Config.src
-+++ b/miscutils/Config.src
-@@ -375,6 +375,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
-   help
- Enables the 'hdparm -d' option to get/set using_dma flag.
- 
-+config LOCK
-+  bool "lock"
-+  default n
-+  help
-+Small utility for using locks in scripts
-+
- config MAKEDEVS
-   bool "makedevs"
-   default y
 a/miscutils/Kbuild.src
-+++ b/miscutils/Kbuild.src
-@@ -33,6 +33,7 @@ lib-$(CONFIG_LAST)+= last.o
- endif
- 
- lib-$(CONFIG_LESS)+= less.o
-+lib-$(CONFIG_LOCK)+= lock.o
- lib-$(CONFIG_MAKEDEVS)+= makedevs.o
- lib-$(CONFIG_MAN) += man.o
- lib-$(CONFIG_MICROCOM)+= microcom.o
 --- /dev/null
 +++ b/miscutils/lock.c
-@@ -0,0 +1,144 @@
+@@ -0,0 +1,155 @@
 +/*
 + * Copyright (C) 2006 Felix Fietkau 
 + *
 + * This is free software, licensed under the GNU General Public License v2.
 + */
++
++//config:config LOCK
++//config: bool "lock"
++//config: default n
++//config: help
++//config:   Small utility for using locks in scripts
++
++//applet:IF_LOCK(APPLET(lock, BB_DIR_BIN, BB_SUID_DROP))
++
++//kbuild:lib-$(CONFIG_LOCK) += lock.o
++
++//usage:#define lock_trivial_usage NOUSAGE_STR
++//usage:#define lock_full_usage ""
++
 +#include 
 +#include 
 +#include 
@@ -50,9 +29,6 @@
 +#include 
 +#include "busybox.h"
 +
-+//usage:#define lock_trivial_usage NOUSAGE_STR
-+//usage:#define lock_full_usage ""
-+
 +static int unlock = 0;
 +static int shared = 0;
 +static int waitonly = 0;
-- 
2.1.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v4 6/6] sunxi: define a Default profile

[Yousong Zhou]

Then the default package set was generated by sort | uniq all current
available device packages and the result set seems tamable

Signed-off-by: Yousong Zhou 
---
 target/linux/sunxi/profiles/00-default.mk | 28 
 1 file changed, 28 insertions(+)
 create mode 100644 target/linux/sunxi/profiles/00-default.mk

diff --git a/target/linux/sunxi/profiles/00-default.mk 
b/target/linux/sunxi/profiles/00-default.mk
new file mode 100644
index 000..b7ecfb0
--- /dev/null
+++ b/target/linux/sunxi/profiles/00-default.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2017 Yousong Zhou
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Default
+  NAME:=Default Profile (all drivers)
+  PACKAGES:= \
+   kmod-ata-core \
+   kmod-ata-sunxi \
+   kmod-brcmfmac \
+   kmod-rtc-sunxi \
+   kmod-rtl8192cu \
+   kmod-rtl8xxxu \
+   kmod-sun4i-emac \
+   rtl8188eu-firmware \
+   swconfig \
+   uboot-sunxi-all \
+   wpad-mini
+  PRIORITY := 1
+endef
+
+define Profile/Default/Description
+  Default profile with package set compatible with most boards.
+endef
+$(eval $(call Profile,Default))
-- 
2.6.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v4 3/6] sunxi: add sysupgrade support

[Yousong Zhou]

Enalbe builtin support for FAT filesystem as we need to mount boot
partition to store sysupgrade.tgz there

Signed-off-by: Yousong Zhou 
---
 .../sunxi/base-files/lib/preinit/79_move_config| 20 +++
 .../linux/sunxi/base-files/lib/upgrade/platform.sh | 67 ++
 target/linux/sunxi/config-4.4  |  4 ++
 3 files changed, 91 insertions(+)
 create mode 100644 target/linux/sunxi/base-files/lib/preinit/79_move_config
 create mode 100644 target/linux/sunxi/base-files/lib/upgrade/platform.sh

diff --git a/target/linux/sunxi/base-files/lib/preinit/79_move_config 
b/target/linux/sunxi/base-files/lib/preinit/79_move_config
new file mode 100644
index 000..c112588
--- /dev/null
+++ b/target/linux/sunxi/base-files/lib/preinit/79_move_config
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Copyright (C) 2012-2015 OpenWrt.org
+
+move_config() {
+   local partdev
+
+   . /lib/upgrade/common.sh
+
+   if export_bootdevice && export_partdevice partdev -1; then
+   if mount -t vfat -o rw,noatime "/dev/$partdev" /mnt; then
+   if [ -f /mnt/sysupgrade.tgz ]; then
+   mv -f /mnt/sysupgrade.tgz /
+   fi
+   umount /mnt
+   fi
+   fi
+}
+
+boot_hook_add preinit_mount_root move_config
+
diff --git a/target/linux/sunxi/base-files/lib/upgrade/platform.sh 
b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
new file mode 100644
index 000..f2cd970
--- /dev/null
+++ b/target/linux/sunxi/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,67 @@
+platform_check_image() {
+   true
+}
+
+platform_copy_config() {
+   local partdev
+
+   if export_partdevice partdev -1; then
+   mount -t vfat -o rw,noatime "/dev/$partdev" /mnt
+   cp -af "$CONF_TAR" /mnt/
+   umount /mnt
+   fi
+}
+
+platform_do_upgrade() {
+   local diskdev partdev ibs diff
+
+   if export_bootdevice && export_partdevice diskdev -2; then
+   sync
+   if [ "$SAVE_PARTITIONS" = "1" ]; then
+   get_partitions "/dev/$diskdev" bootdisk
+
+   #get block size
+   if [ -f "/sys/block/$diskdev/queue/physical_block_size" 
]; then
+   ibs="$(cat 
"/sys/block/$diskdev/queue/physical_block_size")"
+   else
+   ibs=512
+   fi
+
+   #extract the boot sector from the image
+   get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
+
+   get_partitions /tmp/image.bs image
+
+   #compare tables
+   diff="$(grep -F -x -v -f /tmp/partmap.bootdisk 
/tmp/partmap.image)"
+   if [ -n "$diff" ]; then
+   echo "Partition layout is changed.  Full image 
will be written."
+   ask_bool 0 "Abort" && exit
+
+   get_image "$@" | dd of="/dev/$diskdev" bs=4096 
conv=fsync
+   return 0
+   fi
+
+   #write uboot image
+   get_image "$@" | dd of="$diskdev" bs=1024 skip=8 seek=8 
conv=notrunc
+   #iterate over each partition from the image and write 
it to the boot disk
+   while read part start size; do
+   part="$(($part - 2))"
+   if export_partdevice partdev $part; then
+   echo "Writing image to /dev/$partdev..."
+   get_image "$@" | dd of="/dev/$partdev" 
ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
+   else
+   echo "Unable to find partition $part 
device, skipped."
+   fi
+   done < /tmp/partmap.image
+
+   #copy partition uuid
+   echo "Writing new UUID to /dev/$diskdev..."
+   get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 
count=4 seek=440 conv=fsync
+   else
+   get_image "$@" | dd of="/dev/$diskdev" bs=4096 
conv=fsync
+   fi
+
+   sleep 1
+   fi
+}
diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4
index 816f44a..2253afa 100644
--- a/target/linux/sunxi/config-4.4
+++ b/target/linux/sunxi/config-4.4
@@ -162,6 +162,7 @@ CONFIG_F2FS_FS=y
 # CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
+CONFIG_FAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
@@ -347,6 +348,8 @@ CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NET_PTP_CLASSIFY=y
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NLS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
 

[LEDE-DEV] [PATCH v4 4/6] sunxi: use fwtool for checking sdcard images

[Yousong Zhou]

To achieve this, device tree compatible string was used as boardname and
the value of it will be checked against supported_devices list.

It should be noted that we do not distinguish between
sun5i-a13-olimex-som and sun5i-a13-olinuxino as they share the same dts
file.

The other thing is that we need to gunzip the generated firmware to do
fwtool check.

Signed-off-by: Yousong Zhou 
---
 .../linux/sunxi/base-files/etc/board.d/02_network  |   4 +-
 .../base-files/lib/preinit/01_preinit_sunxi.sh |   9 --
 .../sunxi/base-files/lib/preinit/02_b53_hack.sh|   2 +-
 target/linux/sunxi/base-files/lib/sunxi.sh | 140 -
 target/linux/sunxi/image/Makefile  |  17 ++-
 5 files changed, 19 insertions(+), 153 deletions(-)
 delete mode 100644 
target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh

diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network 
b/target/linux/sunxi/base-files/etc/board.d/02_network
index 74fa2a0..2b18748 100755
--- a/target/linux/sunxi/base-files/etc/board.d/02_network
+++ b/target/linux/sunxi/base-files/etc/board.d/02_network
@@ -9,10 +9,10 @@
 board_config_update
 
 case "$( sunxi_board_name )" in
-"olinuxino-micro"*)
+"olimex,a20-olinuxino-micro")
ucidef_set_interface_lan 'wlan0'
;;
-"lamobo-r1")
+"lamobo,lamobo-r1")
ucidef_add_switch "switch0" \
"4:lan:1" "0:lan:2" "1:lan:3" "2:lan:4" "3:wan" "8@eth0"
;;
diff --git a/target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh 
b/target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh
deleted file mode 100644
index f221dbc..000
--- a/target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-do_sunxi() {
-. /lib/sunxi.sh
-
-sunxi_board_detect
-}
-
-boot_hook_add preinit_main do_sunxi
diff --git a/target/linux/sunxi/base-files/lib/preinit/02_b53_hack.sh 
b/target/linux/sunxi/base-files/lib/preinit/02_b53_hack.sh
index 84070de..7f508ff 100644
--- a/target/linux/sunxi/base-files/lib/preinit/02_b53_hack.sh
+++ b/target/linux/sunxi/base-files/lib/preinit/02_b53_hack.sh
@@ -4,7 +4,7 @@
 do_b53_hack() {
# hack: enable switch on Lamobo R1 and reset counters
case "$( sunxi_board_name )" in
-   "lamobo-r1")
+   "lamobo,lamobo-r1")
ifconfig eth0 up
sleep 1
swconfig dev switch0 set reset 1
diff --git a/target/linux/sunxi/base-files/lib/sunxi.sh 
b/target/linux/sunxi/base-files/lib/sunxi.sh
index ce1292b..dbb27fe 100644
--- a/target/linux/sunxi/base-files/lib/sunxi.sh
+++ b/target/linux/sunxi/base-files/lib/sunxi.sh
@@ -1,145 +1,5 @@
 #!/bin/sh
 
-# defaults
-SUNXI_BOARD_NAME="generic"
-SUNXI_BOARD_MODEL="Generic sunxi board"
-
-sunxi_board_detect() {
-   local board
-   local model
-
-   [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/"
-
-   model="$( cat /proc/device-tree/model )"
-
-   case "$model" in
-   "Mele A1000")
-   board="a1000"
-   ;;
-
-   "BA10 tvbox")
-   board="ba10-tvbox"
-   ;;
-
-   "Cubietech Cubieboard")
-   board="cubieboard"
-   ;;
-
-   "Miniand Hackberry")
-   board="hackberry"
-   ;;
-
-   "INet-97F Rev 02")
-   board="inet97fv2"
-   ;;
-
-   "PineRiver Mini X-Plus")
-   board="mini-xplus"
-   ;;
-
-   "Olimex A10-OLinuXino-LIME")
-   board="olinuxino-lime"
-   ;;
-
-   "LinkSprite pcDuino")
-   board="pcduino"
-   ;;
-
-   "Olimex A10s-Olinuxino Micro")
-   board="olinuxino-micro"
-   ;;
-
-   "R7 A10s hdmi tv-stick")
-   board="r7-tv-dongle"
-   ;;
-
-   "HSG H702")
-   board="hsg-h702"
-   ;;
-
-   "Olimex A13-Olinuxino")
-   board="olinuxino"
-   ;;
-
-   "Olimex A13-Olinuxino Micro")
-   board="olinuxino-micro"
-   ;;
-
-   "Allwinner A31 APP4 EVB1 Evaluation Board")
-   board="app4-evb1"
-   ;;
-
-   "WITS A31 Colombus Evaluation Board")
-   board="colombus"
-   ;;
-
-   "Merrii A31 Hummingbird")
-   board="hummingbird"
-   ;;
-
-   "Mele M9 / A1000G Quad top set box")
-   board="m9"
-   ;;
-
-   "LeMaker Banana Pi")
-   

[LEDE-DEV] [PATCH v4 2/6] sunxi: make sdcard image with squashfs as rootfs

[Yousong Zhou]

Two things that need to be noted

 - There is no partition type id allocated for squashfs yet.  In the
   case of sunxi, any non-zero value should work and we keep it 83 (the
   value for ext4)
 - Remaining spare space within the rootfs partition, not the entire
   sdcard space will be formated as either f2fs or ext4 and mounted as
   overlay to serve the role of rootfs_data.

Signed-off-by: Yousong Zhou 
---
 target/linux/sunxi/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile
index cca3a14..b0bc1ba 100644
--- a/target/linux/sunxi/Makefile
+++ b/target/linux/sunxi/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=sunxi
 BOARDNAME:=Allwinner A1x/A20/A3x
-FEATURES:=fpu usb ext4 display rtc
+FEATURES:=fpu usb ext4 display rtc squashfs
 CPU_TYPE:=cortex-a8
 CPU_SUBTYPE:=vfpv3
 MAINTAINER:=Zoltan HERPAI 
@@ -28,5 +28,6 @@ KERNELNAME:=zImage dtbs
 include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += uboot-envtools kmod-eeprom-sunxi kmod-wdt-sunxi
+DEFAULT_PACKAGES += mkf2fs e2fsprogs
 
 $(eval $(call BuildTarget))
-- 
2.6.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] lantiq: fix console print

[Hauke Mehrtens]

The boot loader of many boards provides a kernel boot argument with a
broken console parameter to the kernel. This will be taken before the
stdout-path defined in device tree and the serial will not work on this
board. Multiple boards are affected by this problem, so revert this
patch for all boards. Later we can remove the boot arguments from the
device tree again, after the individual board was checked to work.

This partly reverts this commit:
commit 4995c64857a09c4cc92238ba0bd52cdb06c4c581
Author: Martin Blumenstingl 
Date:   Sun Dec 11 21:55:00 2016 +0100

lantiq: specify console using stdout-path instead of cmdline argument

Signed-off-by: Hauke Mehrtens 
---
 target/linux/lantiq/dts/ACMP252.dts   | 4 
 target/linux/lantiq/dts/ARV4510PW.dts | 4 
 target/linux/lantiq/dts/ARV4518PWR01.dtsi | 4 
 target/linux/lantiq/dts/ARV4519PW.dts | 4 
 target/linux/lantiq/dts/ARV4520PW.dts | 4 
 target/linux/lantiq/dts/ARV452CQW.dts | 4 
 target/linux/lantiq/dts/ARV7510PW22.dts   | 4 
 target/linux/lantiq/dts/ARV7518PW.dts | 4 
 target/linux/lantiq/dts/ARV7519PW.dts | 4 
 target/linux/lantiq/dts/ARV7519RW22.dts   | 4 
 target/linux/lantiq/dts/ARV7525PW.dts | 4 
 target/linux/lantiq/dts/ARV752DPW.dts | 4 
 target/linux/lantiq/dts/ARV752DPW22.dts   | 4 
 target/linux/lantiq/dts/BTHOMEHUBV2B.dts  | 4 
 target/linux/lantiq/dts/BTHOMEHUBV3A.dts  | 4 
 target/linux/lantiq/dts/BTHOMEHUBV5A.dts  | 4 
 target/linux/lantiq/dts/DGN1000B.dts  | 4 
 target/linux/lantiq/dts/DGN3500.dtsi  | 2 +-
 target/linux/lantiq/dts/EASY50712.dts | 4 
 target/linux/lantiq/dts/EASY50810.dts | 4 
 target/linux/lantiq/dts/EASY80920.dtsi| 4 
 target/linux/lantiq/dts/FRITZ3370.dts | 2 +-
 target/linux/lantiq/dts/FRITZ7320.dts | 4 
 target/linux/lantiq/dts/FRITZ7360SL.dts   | 4 
 target/linux/lantiq/dts/GIGASX76X.dts | 4 
 target/linux/lantiq/dts/H201L.dts | 4 
 target/linux/lantiq/dts/P2601HNFX.dts | 4 
 target/linux/lantiq/dts/P2812HNUFX.dtsi   | 4 
 target/linux/lantiq/dts/TDW89X0.dtsi  | 4 
 target/linux/lantiq/dts/VG3503J.dts   | 4 
 target/linux/lantiq/dts/VGV7510KW22.dtsi  | 2 +-
 target/linux/lantiq/dts/VGV7519.dtsi  | 2 +-
 target/linux/lantiq/dts/VR200v.dts| 4 
 target/linux/lantiq/dts/WBMR.dts  | 4 
 target/linux/lantiq/dts/WBMR300.dts   | 4 
 35 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/target/linux/lantiq/dts/ACMP252.dts 
b/target/linux/lantiq/dts/ACMP252.dts
index 50c011acaa..a94014b0f9 100644
--- a/target/linux/lantiq/dts/ACMP252.dts
+++ b/target/linux/lantiq/dts/ACMP252.dts
@@ -5,6 +5,10 @@
 / {
model = "ACMP252 - AudioCodes MediaPack MP-252";
 
+   chosen {
+   bootargs = "console=ttyLTQ0,115200";
+   };
+
memory@0 {
reg = <0x0 0x400>;
};
diff --git a/target/linux/lantiq/dts/ARV4510PW.dts 
b/target/linux/lantiq/dts/ARV4510PW.dts
index 58507672a6..17609e25ba 100644
--- a/target/linux/lantiq/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/dts/ARV4510PW.dts
@@ -7,6 +7,10 @@
 / {
model = "ARV4510PW - Wippies, Elisa";
 
+   chosen {
+   bootargs = "console=ttyLTQ0,115200";
+   };
+
aliases {
led-boot = 
led-failsafe = 
diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi 
b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
index c527147e91..8e712bfec6 100644
--- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -3,6 +3,10 @@
 #include 
 
 / {
+   chosen {
+   bootargs = "console=ttyLTQ0,115200";
+   };
+
aliases {
led-boot = 
led-failsafe = 
diff --git a/target/linux/lantiq/dts/ARV4519PW.dts 
b/target/linux/lantiq/dts/ARV4519PW.dts
index fe0f9a7ac4..86c0d48763 100644
--- a/target/linux/lantiq/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/dts/ARV4519PW.dts
@@ -7,6 +7,10 @@
 / {
model = "ARV4519PW - Vodafone Netfaster IAD 2, Pirelli P.RG A4201G";
 
+   chosen {
+   bootargs = "console=ttyLTQ0,115200";
+   };
+
aliases {
led-boot = _green;
led-failsafe = _red;
diff --git a/target/linux/lantiq/dts/ARV4520PW.dts 
b/target/linux/lantiq/dts/ARV4520PW.dts
index 2ad3a8a080..030e316c87 100644
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -7,6 +7,10 @@
 / {
model = "ARV4520PW - Easybox 800, WAV-281";
 
+   chosen {
+   bootargs = "console=ttyLTQ0,115200";
+   };
+
aliases {
led-boot = _blue;
led-failsafe = _red;
diff --git a/target/linux/lantiq/dts/ARV452CQW.dts 
b/target/linux/lantiq/dts/ARV452CQW.dts
index 8d47b3b7db..6bc0796f9e 100644

[LEDE-DEV] Finished porting of chan_lantiq to asterisk11 and asterisk13

[Stefan Koch]

Hi

I have finished the chan_lantiq porting from asterisk 1.8 to asterisk 11 
and asterisk 13.


GIT-Repository:
https://github.com/kochstefan/asterisk_channel_lantiq.git

See branches:
asterisk-1_8 (asterisk 1.8 needs glibc)
asterisk-11 (asterisk 11 needs musl)
asterisk-13 (asterisk 13 needs musl or glibc)

Master's latest commit is compatible with asterisk 13.

To apply it to the telephony feed, try the patches within the following 
archive:

https://drive.google.com/file/d/0B9Z_KppE2R8sdnhIcFV6dEpCbUE

I have successfully tested the chan_lantiq for asterisk 1.8, 11 and 13 
on a vr9 based box.


To include this into the telephony feed:
Should I create a pull request from the patches above?
(Take a copy from chan_lantic.c into telephony feed)

Or should I change it first that the GIT repository is directly linked?
(Then the sources would automatically considered if changed, without a 
copy from chan_lantiq.c)


Kernel driver changes are already made for vr9 based boards.
If the board specific dts file is not already updated it needs the 
following addition to the command line:

mem=[TOTALMEMSIZE-2M] vpe1_load_addr=ADDRESS vpe1_mem=2M maxvpes=1 maxtcs=1

See:
https://github.com/lede-project/source/pull/440

XWAY based boards shouldn't need a drivers change.

Best regards

Stefan


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] uboot-sunxi: fixup making uboot-xxx-boot.scr

[Yousong Zhou]

Signed-off-by: Yousong Zhou 
---
This patch intends to fixup the commit rewriting uboot-sunxi: "uboot-sunxi: add
uboot-sunxi-all for selecting all other variants"

 package/boot/uboot-sunxi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/boot/uboot-sunxi/Makefile 
b/package/boot/uboot-sunxi/Makefile
index d18520d..cb9935b 100644
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -35,7 +35,7 @@ endef
 define Package/uboot-sunxi-$(1)/install
$(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
$(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-u-boot-with-spl.bin
-   mkimage -C none -A arm -T script -d uEnv-$(if $(filter-out 
pangolin,$(1)),pangolin,default).txt \
+   mkimage -C none -A arm -T script -d uEnv-$(if $(3),$(3),default).txt \
$(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-boot.scr
 endef
 
@@ -59,7 +59,7 @@ $(eval $(call 
Package/uboot/template,Linksprite_pcDuino,Linksprite pcDuino))
 $(eval $(call Package/uboot/template,Linksprite_pcDuino3,Linksprite pcDuino3))
 $(eval $(call Package/uboot/template,Lamobo_R1,Lamobo R1))
 $(eval $(call Package/uboot/template,orangepi_plus,Orange Pi Plus (H3)))
-$(eval $(call Package/uboot/template,pangolin,Theobroma A31-yQ7 devboard))
+$(eval $(call Package/uboot/template,pangolin,Theobroma A31-yQ7 
devboard,pangolin))
 
 define Package/uboot-sunxi-all
   SECTION:=boot
-- 
2.6.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [RFC PATCH odhcpd] config: respect ignore uci option

[Stijn Tintel]

On 03-01-17 14:09, Jo-Philipp Wich wrote:
> The odhcpd documentation currently implies that "option ignore 1" in a section
> of type "dhcp" will disable any services on the referenced interface while the
> code actually ignores the setting when initializing referenced interfaces.
>
> This commonly leads to situations where users think that "option disabled"
> will prevent any server activity on a given interface while in reality odhcpd
> effectively acts as rogue DHCPv6 server in its default configuration.
>
> To fully inhibit any activity, one has to specify both "option ignore 1" as
> well as "option ra disabled", "option ndp disabled" and
> "option dhcpv6 disabled" which is highly counter intuitive at best.
>
> A previous commit (5f425ed Respect interface "ignore" settings as documented.)
> attempted to address the problem by observing the value of i->ignore instead
> of unconditionally enabling all protocols but broke the ability to use DHCPv6
> relay mode while having DHCPv4 disabled.
>
> This patch changes ...
>
>  - the enabling of services on an interface to use the value of the ignore
>option as default choice instead of hardcoding "true"
>
>  - the options "ra", "ndp", "dhcpv4" and "dhcpv6" to take precedence over the
>default "ignore" state to allow selectively enabling services on ignored
>interfaces
>
>  - the README to clarify the fact that "ra", "ndp", "dhcpv4" and "dhcpv6" can
>now override "option ignore"
>
> Signed-off-by: Jo-Philipp Wich 
Tested-by: Stijn Tintel 

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] ar71xx: add support for RB-941-2nD

[Thibaut VARENE <ha...@slashdirt.org>]

>From e55aa1ddff1563d582b456807f20c0457fcaed77 Mon Sep 17 00:00:00 2001
From: Thibaut VARENE 
Date: Wed, 4 Jan 2017 22:44:54 +0100
Subject: [PATCH] ar71xx: add support for RB-941-2nD

Add full support for Mikrotik RB-941-2nD (hAP lite)

Original patch by Sergey Sergeev  and
more information is available here:
https://wiki.openwrt.org/toh/mikrotik/rb941_2nd
I updated and adapted the patch to apply cleanly to LEDE trunk
and added proper numbering for the switch ports (matching case
labels).
Tested working on actual hardware with the information
provided in the above webpage. Sysupgrade works.

Signed-off-by: Thibaut VARENE 
---
 target/linux/ar71xx/base-files/etc/board.d/01_leds |   3 +
 .../linux/ar71xx/base-files/etc/board.d/02_network |   4 +
 target/linux/ar71xx/base-files/etc/diag.sh |   2 +-
 target/linux/ar71xx/base-files/lib/ar71xx.sh   |   3 +
 .../ar71xx/base-files/lib/upgrade/platform.sh  |  29 +++-
 target/linux/ar71xx/config-4.4 |   1 +
 .../ar71xx/files/arch/mips/ath79/Kconfig.openwrt   |  10 ++
 target/linux/ar71xx/files/arch/mips/ath79/Makefile |   1 +
 .../ar71xx/files/arch/mips/ath79/mach-rb941.c  | 174 +
 .../linux/ar71xx/files/arch/mips/ath79/machtypes.h |   1 +
 target/linux/ar71xx/image/legacy.mk|  23 +++
 .../linux/ar71xx/mikrotik/profiles/03-norflash.mk  |  16 ++
 12 files changed, 263 insertions(+), 4 deletions(-)
 create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-rb941.c
 create mode 100644 target/linux/ar71xx/mikrotik/profiles/03-norflash.mk

diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds 
b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index c6dcf36..75b5142 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -199,6 +199,9 @@ rb-750)
ucidef_set_led_switch "port4" "port4" "rb750:green:port4" "switch0" 
"0x04"
ucidef_set_led_switch "port5" "port5" "rb750:green:port5" "switch0" 
"0x02"
;;
+rb-941-2nd)
+   ucidef_set_led_timer "act" "act" "rb:green:act" "1000" "1000"
+   ;;
 rb-2011l|\
 rb-2011uas|\
 rb-2011uias|\
diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network 
b/target/linux/ar71xx/base-files/etc/board.d/02_network
index 8acd214..6fd9601 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -237,6 +237,10 @@ ar71xx_setup_interfaces()
dap-2695-a1)
ucidef_add_switch "switch0" "0@eth0" "2:lan" "3:wan" "6@eth1"
;;
+   rb-941-2nd)
+   ucidef_add_switch "switch0" \
+   "0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:wan:1"
+   ;;
db120|\
rb-2011l|\
rb-2011uas|\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index d060ccf..75c6c9a 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -288,7 +288,7 @@ get_status_led() {
rb-912uag-5hpnd)
status_led="rb:green:user"
;;
-   rb-951ui-2hnd)
+   rb-951ui-2hnd | rb-941-2nd)
status_led="rb:green:act"
;;
rb-sxt2n|\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 3241100..527112b 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -827,6 +827,9 @@ ar71xx_board_detect() {
*"RouterBOARD 912UAG-5HPnD")
name="rb-912uag-5hpnd"
;;
+   *"RouterBOARD 941-2nD")
+   name="rb-941-2nd"
+   ;;
*"RouterBOARD 951G-2HnD")
name="rb-951g-2hnd"
;;
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 570aa68..5847125 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -11,6 +11,8 @@ RAMFS_COPY_DATA=/lib/ar71xx.sh
 CI_BLKSZ=65536
 CI_LDADR=0x8006
 
+PLATFORM_DO_UPGRADE_COMBINED_SEPARATE_MTD=0
+
 platform_find_partitions() {
local first dev size erasesize name
while read dev size erasesize name; do
@@ -40,6 +42,13 @@ platform_find_kernelpart() {
done
 }
 
+platform_find_rootfspart() {
+   local part
+   for part in "${1%:*}" "${1#*:}"; do
+   [ "$part" != "$2" ] && echo "$part"; break
+   done
+}
+
 platform_do_upgrade_combined() {
local partitions=$(platform_find_partitions)
local kernelpart=$(platform_find_kernelpart "${partitions#*:}")
@@ -53,13 +62,22 @@ platform_do_upgrade_combined() {
   [ ${root_blocks:-0} -gt 0 ] && \
   [ ${erase_size:-0} -gt 

[LEDE-DEV] [PATCH] zlib: update to 1.2.10

[Magnus Kroken]

* Fix bug in deflate_stored() for zero-length input
* Fix bug in gzwrite.c that produced corrupt gzip files

Signed-off-by: Magnus Kroken 
---
Zlib authors recommend immediately upgrading from 1.2.9 due to these bugs.

 package/libs/zlib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index 93c8115..d6155b6 100644
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
-PKG_VERSION:=1.2.9
+PKG_VERSION:=1.2.10
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng
-PKG_HASH:=03d9c7f67976cf1389589782de46f45011053ea7f4222c2fb8c2cf9fd813bb68
+PKG_HASH:=9612bf086047078ce3a1c154fc9052113fc1a2a97234a059da17a6299bd4dd32
 
 PKG_LICENSE:=Zlib
 PKG_LICENSE_FILES:=README
-- 
2.1.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v4 1/6] sunxi: convert to new image generation method

[Yousong Zhou]

The new Device/xxx were transformed automatically from old profiles.

Most device names are now taken from basename of the corresponding
kernel device tree file.  Device/sun5i-a13-olimex-som is an exception
because it is not explicitly supported in the kernel yet and shares the
same dts file with Device/sun5i-a13-olinuxino

Signed-off-by: Yousong Zhou 
---
 target/linux/sunxi/image/Makefile| 212 +++
 target/linux/sunxi/image/gen_sunxi_sdcard_img.sh |   3 +-
 target/linux/sunxi/profiles/01-default.mk|  17 --
 target/linux/sunxi/profiles/a10-olinuxino.mk |  19 --
 target/linux/sunxi/profiles/a13-olimex-som.mk|  18 --
 target/linux/sunxi/profiles/a13-olinuxino.mk |  18 --
 target/linux/sunxi/profiles/a20-olinuxino.mk |  33 
 target/linux/sunxi/profiles/bananapi.mk  |  18 --
 target/linux/sunxi/profiles/bananapro.mk |  19 --
 target/linux/sunxi/profiles/cubieboard.mk|  19 --
 target/linux/sunxi/profiles/cubieboard2.mk   |  19 --
 target/linux/sunxi/profiles/cubietruck.mk|  19 --
 target/linux/sunxi/profiles/lamobo-r1.mk |  19 --
 target/linux/sunxi/profiles/mele_m9.mk   |  18 --
 target/linux/sunxi/profiles/orangepi_plus.mk |  18 --
 target/linux/sunxi/profiles/pcduino.mk   |  18 --
 target/linux/sunxi/profiles/pcduino3.mk  |  19 --
 17 files changed, 143 insertions(+), 363 deletions(-)
 delete mode 100644 target/linux/sunxi/profiles/01-default.mk
 delete mode 100644 target/linux/sunxi/profiles/a10-olinuxino.mk
 delete mode 100644 target/linux/sunxi/profiles/a13-olimex-som.mk
 delete mode 100644 target/linux/sunxi/profiles/a13-olinuxino.mk
 delete mode 100644 target/linux/sunxi/profiles/a20-olinuxino.mk
 delete mode 100644 target/linux/sunxi/profiles/bananapi.mk
 delete mode 100644 target/linux/sunxi/profiles/bananapro.mk
 delete mode 100644 target/linux/sunxi/profiles/cubieboard.mk
 delete mode 100644 target/linux/sunxi/profiles/cubieboard2.mk
 delete mode 100644 target/linux/sunxi/profiles/cubietruck.mk
 delete mode 100644 target/linux/sunxi/profiles/lamobo-r1.mk
 delete mode 100644 target/linux/sunxi/profiles/mele_m9.mk
 delete mode 100644 target/linux/sunxi/profiles/orangepi_plus.mk
 delete mode 100644 target/linux/sunxi/profiles/pcduino.mk
 delete mode 100644 target/linux/sunxi/profiles/pcduino3.mk

diff --git a/target/linux/sunxi/image/Makefile 
b/target/linux/sunxi/image/Makefile
index c7d90a2..07beb03 100644
--- a/target/linux/sunxi/image/Makefile
+++ b/target/linux/sunxi/image/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2013-2016 OpenWrt.org
+# Copyright (C) 2016 Yousong Zhou
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,111 +12,182 @@ include $(INCLUDE_DIR)/host.mk
 FAT32_BLOCK_SIZE=1024
 FAT32_BLOCKS=$(shell echo 
$$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE
 
-define Image/BuildKernel
-   -mkdir -p $(KDIR_TMP)
-
-   mkimage -A arm -O linux -T kernel -C none \
-   -a 0x40008000 -e 0x40008000 \
-   -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' \
-   -d $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-   $(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
-   echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
-   $(call Image/BuildKernel/MkuImage, \
-   none, 0x40008000, 0x40008000, \
-   $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs, \
-   $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \
-   )
-endif
-endef
-
-define Image/Build/SDCard
-   rm -f $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img
-   mkfs.fat $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img -C 
$(FAT32_BLOCKS)
-
-   mcopy -i $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img 
$(KDIR)/uboot-sunxi-$(PROFILE)-boot.scr ::boot.scr
-   mcopy -i $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img 
$(DTS_DIR)/$(2).dtb ::dtb
-   mcopy -i $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img 
$(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage
-
-   ./gen_sunxi_sdcard_img.sh \
-   $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img \
-   $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img \
-   $(KDIR)/root.$(1) \
+KERNEL_LOADADDR:=0x40008000
+
+define Build/sunxi-sdcard
+   rm -f $@.boot
+   mkfs.fat $@.boot -C $(FAT32_BLOCKS)
+
+   mcopy -i $@.boot $(KDIR)/uboot-sunxi-$(SUNXI_UBOOT)-boot.scr ::boot.scr
+   mcopy -i $@.boot $(DTS_DIR)/$(SUNXI_DTS).dtb ::dtb
+   mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage
+   ./gen_sunxi_sdcard_img.sh $@ \
+   $@.boot \
+   $(IMAGE_ROOTFS) \
$(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \
$(CONFIG_TARGET_ROOTFS_PARTSIZE) \
-   $(KDIR)/uboot-sunxi-$(PROFILE)-u-boot-with-spl.bin
-
-  

[LEDE-DEV] [PATCH v4 0/6] sunxi: rework image build and sysupgrade support

[Yousong Zhou]

This series mainly tries achieve the following goals

 - use new image generation method
 - squashfs sdcard image support
 - mkfs.f2fs or mkfs.ext4 remaining space within squashfs rootfs partition and
   mount it as rw overlay
 - sysupgrade with fwtool check support

Device profiles are automatically generated with a helper makefile.  Names for
image files, board_names, etc. are changed to try to use basename of kernel dts
file for the specific device.

Run-tested with cubietech,cubieboard2, compile-tested others

v4 <- v3

 - Makefile of uboot-sunxi was rewritten and meta package uboot-sunxi-all was
   added for selecting all other variants
 - Default profile now selects uboot-sunxi-all

v3 <- v2

 - added a Default profile and while doing this removed uboot-sunxi package

v2 <- v1:

 - rebased on staging/nbd
 - use $@.boot instead of relying on IMAGE_PREFIX when making the vfat boot
   partition
 - Set PROFILES:=Default in Device/Default

Yousong Zhou (6):
  sunxi: convert to new image generation method
  sunxi: make sdcard image with squashfs as rootfs
  sunxi: add sysupgrade support
  sunxi: use fwtool for checking sdcard images
  uboot-sunxi: add uboot-sunxi-all for selecting all other variants
  sunxi: define a Default profile

 package/boot/uboot-sunxi/Makefile  | 192 +
 target/linux/sunxi/Makefile|   3 +-
 .../linux/sunxi/base-files/etc/board.d/02_network  |   4 +-
 .../base-files/lib/preinit/01_preinit_sunxi.sh |   9 -
 .../sunxi/base-files/lib/preinit/02_b53_hack.sh|   2 +-
 .../sunxi/base-files/lib/preinit/79_move_config|  20 ++
 target/linux/sunxi/base-files/lib/sunxi.sh | 140 -
 .../linux/sunxi/base-files/lib/upgrade/platform.sh |  67 ++
 target/linux/sunxi/config-4.4  |   4 +
 target/linux/sunxi/image/Makefile  | 227 ++---
 target/linux/sunxi/image/gen_sunxi_sdcard_img.sh   |   3 +-
 target/linux/sunxi/profiles/00-default.mk  |  28 +++
 target/linux/sunxi/profiles/01-default.mk  |  17 --
 target/linux/sunxi/profiles/a10-olinuxino.mk   |  19 --
 target/linux/sunxi/profiles/a13-olimex-som.mk  |  18 --
 target/linux/sunxi/profiles/a13-olinuxino.mk   |  18 --
 target/linux/sunxi/profiles/a20-olinuxino.mk   |  33 ---
 target/linux/sunxi/profiles/bananapi.mk|  18 --
 target/linux/sunxi/profiles/bananapro.mk   |  19 --
 target/linux/sunxi/profiles/cubieboard.mk  |  19 --
 target/linux/sunxi/profiles/cubieboard2.mk |  19 --
 target/linux/sunxi/profiles/cubietruck.mk  |  19 --
 target/linux/sunxi/profiles/lamobo-r1.mk   |  19 --
 target/linux/sunxi/profiles/mele_m9.mk |  18 --
 target/linux/sunxi/profiles/orangepi_plus.mk   |  18 --
 target/linux/sunxi/profiles/pcduino.mk |  18 --
 target/linux/sunxi/profiles/pcduino3.mk|  19 --
 27 files changed, 332 insertions(+), 658 deletions(-)
 delete mode 100644 
target/linux/sunxi/base-files/lib/preinit/01_preinit_sunxi.sh
 create mode 100644 target/linux/sunxi/base-files/lib/preinit/79_move_config
 create mode 100644 target/linux/sunxi/base-files/lib/upgrade/platform.sh
 create mode 100644 target/linux/sunxi/profiles/00-default.mk
 delete mode 100644 target/linux/sunxi/profiles/01-default.mk
 delete mode 100644 target/linux/sunxi/profiles/a10-olinuxino.mk
 delete mode 100644 target/linux/sunxi/profiles/a13-olimex-som.mk
 delete mode 100644 target/linux/sunxi/profiles/a13-olinuxino.mk
 delete mode 100644 target/linux/sunxi/profiles/a20-olinuxino.mk
 delete mode 100644 target/linux/sunxi/profiles/bananapi.mk
 delete mode 100644 target/linux/sunxi/profiles/bananapro.mk
 delete mode 100644 target/linux/sunxi/profiles/cubieboard.mk
 delete mode 100644 target/linux/sunxi/profiles/cubieboard2.mk
 delete mode 100644 target/linux/sunxi/profiles/cubietruck.mk
 delete mode 100644 target/linux/sunxi/profiles/lamobo-r1.mk
 delete mode 100644 target/linux/sunxi/profiles/mele_m9.mk
 delete mode 100644 target/linux/sunxi/profiles/orangepi_plus.mk
 delete mode 100644 target/linux/sunxi/profiles/pcduino.mk
 delete mode 100644 target/linux/sunxi/profiles/pcduino3.mk

-- 
2.6.4


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH v4 5/6] uboot-sunxi: add uboot-sunxi-all for selecting all other variants

[Yousong Zhou]

While at it, the following changes are introduced

 - Rewrite the Makefile for better readability
 - Make parallel builds possible

Signed-off-by: Yousong Zhou 
---
 package/boot/uboot-sunxi/Makefile | 192 ++
 1 file changed, 50 insertions(+), 142 deletions(-)

diff --git a/package/boot/uboot-sunxi/Makefile 
b/package/boot/uboot-sunxi/Makefile
index 70a5d4d..d18520d 100644
--- a/package/boot/uboot-sunxi/Makefile
+++ b/package/boot/uboot-sunxi/Makefile
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2013-2016 OpenWrt.org
+# Copyright (C) 2017 Yousong Zhou
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,178 +12,85 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=u-boot
 PKG_VERSION:=2016.03
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:= \
-   http://mirror2.openwrt.org/sources \
-   ftp://ftp.denx.de/pub/u-boot
-
+PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
 PKG_HASH:=e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
+PKG_MAINTAINER:=Zoltan HERPAI 
 PKG_LICENSE:=GPL-2.0 GPL-2.0+
 PKG_LICENSE_FILES:=Licenses/README
 
-include $(INCLUDE_DIR)/package.mk
-
-define uboot/Default
-  TITLE:=
-  CONFIG:=
-  IMAGE:=
-endef
-
-define uboot/A10-OLinuXino-Lime
-  TITLE:=U-Boot for the A10 OLinuXino LIME
-endef
-
-define uboot/A13-OLinuXino
-  TITLE:=U-Boot for the A13 OlinuXino
-endef
-
-define uboot/A20-OLinuXino-Lime
-  TITLE:=U-Boot for the A20 OLinuXino LIME
-endef
-
-define uboot/A20-OLinuXino_MICRO
-  TITLE:=U-Boot for A20 OLinuXino MICRO
-endef
-
-define uboot/Bananapi
-  TITLE:=U-Boot for Bananapi
-endef
-
-define uboot/Bananapro
-  TITLE:=U-Boot for Bananapro
-endef
-
-define uboot/Cubieboard
-  TITLE:=U-Boot for Cubieboard
-endef
-
-define uboot/Cubieboard2
-  TITLE:=U-Boot for Cubieboard2
-endef
-
-define uboot/Cubietruck
-  TITLE:=U-Boot for Cubietruck
-endef
-
-define uboot/Hummingbird_A31
-  TITLE:=U-Boot for the Hummingbird A31 board
-endef
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
-define uboot/Mele_M9
-  TITLE:=U-Boot for the Mele M9 (A31)
-endef
+include $(INCLUDE_DIR)/package.mk
 
-define uboot/OLIMEX_A13_SOM
-  TITLE:=U-Boot for the Olimex A13 SOM
+define Package/uboot/template
+define Package/uboot-sunxi-$(1)
+  SECTION:=boot
+  CATEGORY:=Boot Loaders
+  DEPENDS:=@TARGET_sunxi
+  TITLE:=U-Boot for $(2)
+  URL:=http://www.denx.de/wiki/U-Boot
+  VARIANT:=$(1)
 endef
 
-define uboot/Linksprite_pcDuino
-  TITLE:=U-Boot for Linksprite pcDuino
-endef  
-
-define uboot/Linksprite_pcDuino3
-  TITLE:=U-Boot for Linksprite pcDuino3
-endef  
-
-define uboot/Lamobo_R1
-  TITLE:=U-Boot for Lamobo R1
+define Package/uboot-sunxi-$(1)/install
+   $(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \
+   $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-u-boot-with-spl.bin
+   mkimage -C none -A arm -T script -d uEnv-$(if $(filter-out 
pangolin,$(1)),pangolin,default).txt \
+   $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-boot.scr
 endef
 
-define uboot/pangolin
-  TITLE:=U-Boot for Theobroma A31-yQ7 devboard
-endef
+UBOOT_SUNXI_PACKAGES += uboot-sunxi-$(1)
 
-define uboot/orangepi_plus
-  TITLE:=U-Boot for Orange Pi Plus (H3)
 endef
 
-UBOOTS:= \
-   A10-OLinuXino-Lime \
-   A13-OLinuXino \
-   A20-OLinuXino-Lime \
-   A20-OLinuXino_MICRO \
-   Bananapi \
-   Bananapro \
-   Cubieboard \
-   Cubieboard2 \
-   Cubietruck \
-   Hummingbird_A31 \
-   Mele_M9 \
-   OLIMEX_A13_SOM \
-   Linksprite_pcDuino \
-   Linksprite_pcDuino3 \
-   Lamobo_R1 \
-   orangepi_plus \
-   pangolin
+$(eval $(call Package/uboot/template,A10-OLinuXino-Lime,the A10 OLinuXino 
LIME))
+$(eval $(call Package/uboot/template,A13-OLinuXino,the A13 OlinuXino))
+$(eval $(call Package/uboot/template,A20-OLinuXino-Lime,the A20 OLinuXino 
LIME))
+$(eval $(call Package/uboot/template,A20-OLinuXino_MICRO,A20 OLinuXino MICRO))
+$(eval $(call Package/uboot/template,Bananapi,Bananapi))
+$(eval $(call Package/uboot/template,Bananapro,Bananapro))
+$(eval $(call Package/uboot/template,Cubieboard,Cubieboard))
+$(eval $(call Package/uboot/template,Cubieboard2,Cubieboard2))
+$(eval $(call Package/uboot/template,Cubietruck,Cubietruck))
+$(eval $(call Package/uboot/template,Hummingbird_A31,the Hummingbird A31 
board))
+$(eval $(call Package/uboot/template,Mele_M9,the Mele M9 (A31)))
+$(eval $(call Package/uboot/template,OLIMEX_A13_SOM,the Olimex A13 SOM))
+$(eval $(call Package/uboot/template,Linksprite_pcDuino,Linksprite pcDuino))
+$(eval $(call Package/uboot/template,Linksprite_pcDuino3,Linksprite pcDuino3))
+$(eval $(call Package/uboot/template,Lamobo_R1,Lamobo R1))
+$(eval $(call Package/uboot/template,orangepi_plus,Orange Pi Plus (H3)))
+$(eval $(call 

Re: [LEDE-DEV] [PATCH] uboot-sunxi: fixup making uboot-xxx-boot.scr

[Felix Fietkau]

On 2017-01-04 17:27, Yousong Zhou wrote:
> Signed-off-by: Yousong Zhou 
> ---
> This patch intends to fixup the commit rewriting uboot-sunxi: "uboot-sunxi: 
> add
> uboot-sunxi-all for selecting all other variants"
Folded into that commit in my staging tree.

Thanks,

- Felix


___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH v4 0/6] sunxi: rework image build and sysupgrade support

[Yousong Zhou]

On 4 January 2017 at 22:42, Felix Fietkau  wrote:
> On 2017-01-04 15:19, Yousong Zhou wrote:
>> This series mainly tries achieve the following goals
>>
>>  - use new image generation method
>>  - squashfs sdcard image support
>>  - mkfs.f2fs or mkfs.ext4 remaining space within squashfs rootfs partition 
>> and
>>mount it as rw overlay
>>  - sysupgrade with fwtool check support
>>
>> Device profiles are automatically generated with a helper makefile.  Names 
>> for
>> image files, board_names, etc. are changed to try to use basename of kernel 
>> dts
>> file for the specific device.
>>
>> Run-tested with cubietech,cubieboard2, compile-tested others
> Merged to my staging tree, thanks.
>
> I made some modifications though:
> Since patch 1 deletes an existing default profile and patch 6 adds a new
> one, I've folded patch 6 into 1 and put patch 5 first (because of
> dependencies).
>
> - Felix

Makes sense, thanks for taking care of that.

The other thing is the patch series does not yet appear in the
lede-dev mail archive.  Is there something wrong with the mailing list
or was it caused by my oversized mail in v3 being still being hold
off?

yousong

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] brcm47xx: legacy: specify DEVICE_PACKAGES for all devices

[Rafał Miłecki]

On 29 December 2016 at 08:06, Rafał Miłecki  wrote:
> From: Rafał Miłecki 
>
> This allows more feature complete images. Of course it affect the size,
> e.g. enabling b43 bumped rootfs from 1569618 to 2029122 for me.
>
> Signed-off-by: Rafał Miłecki 

For devices with BCM4306 it's not clear if b43 or b43legacy is needed.
Both should be included until we get a proper report.

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] newbie opkg upgrading questions..

[Bastian Bittorf]

* Yousong Zhou  [04.01.2017 09:09]:
> > root@wzr-ag300h:~# mount
> > proc on /proc type proc (ro,noatime)
> > tmpfs on /tmp type tmpfs (rw,nosuid,nodev,noatime)
> > overlayfs:/overlay on / type overlay
> > (ro,noatime,lowerdir=/,upperdir=/overlay/upper,workdir=/overlay/work)
> > tmpfs on /dev type tmpfs (ro,relatime,size=512k,mode=755)
> > devpts on /dev/pts type devpts (ro,relatime,mode=600)

in /etc/profile there is a check which should
warn about this special issue on login. Mr. Cook, can
you please post the output of /proc/mounts ?

what is the output of:
grep '/ overlay ro,' /proc/mounts

thanks & bye, bastian

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev