Re: [OpenWrt-Devel] [PATCH] dnsmasq bump to dnsmasq2.74rc3
On 18/07/15 05:26, Steven Barth wrote: I don't think we should be tracking RCs any longer. I did this for 2.73 mainly due to the security exploit and there not being a stable update, plus DNSSEC was pretty screwed before that. I think we should go back to backporting individual fixes via patches instead. Hi Steven, Understood, no problem. Judging by how quickly 2.74tests 3 release candidates have come out I think Simon is keen to avoid a lengthy gestation of what is really a bug fix release :-) There's a minor change that I'm working on, hopefully finished by tomorrow that I'd like to see in, at the very least I'll offer it as an OpenWrt patch. I think it worth pushing your improved time checking heuristic patch to Simon to get it in upstream. Cheers, Kevin smime.p7s Description: S/MIME Cryptographic Signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC] brcm2708: enable hard float ABI
I agree with you and I can't see the point in keeping CONFIG_SOFT_FLOAT option at all, since it messes toolchain/staging directories (at least as it is right now, but if anyone thinks we should keep it then it needs to be fixed somehow). Let's see what others have to say about that. Regards, Álvaro. El 17/07/2015 a las 19:46, Matthias Schiffer escribió: As I wrote in my last mail, using the same toolchain build/staging dirs with different float ABIs seems broken to me and should be fixed before any further work is done towards adding hard float support to BCM270x. After thinking a bit more about this, I came to the conclusion that the whole CONFIG_SOFT_FLOAT/CONFIG_HAS_FPU mess should be removed. Currently, having two targets using the same CPU_TYPE/CPU_SUBTYPE combination, but with different HAS_FPU, will break. In my opinion, the float ABI toolchain flags should only depend on the CPU_SUBTYPE, so when similar CPUs should use different float ABIs, a separate CPU_SUBTYPE would need to be created and thus separate build/staging dirs are used. If we really want to keep the CONFIG_SOFT_FLOAT option, at least a softfp suffix or similar would need to be added to the toolchain build/staging dir names, as mentioned before. I can write patches for that, but the OpenWrt team must decide which way to go. Regards, Matthias On 07/17/2015 07:28 PM, Álvaro Fernández Rojas wrote: This enables hard float abi on BCM2708 (RPi1) and also enables neon on BCM2709 (RPi2). Attention: minimally tested, but seems to be OK. The toolchain directory changes on BCM2709 due to switching the CPU subtype to neon, but BCM2708 needs a distclean. Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com --- target/linux/brcm2708/Makefile | 4 +--- target/linux/brcm2708/bcm2708/target.mk | 2 ++ target/linux/brcm2708/bcm2709/target.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index 6d8aba0..a3e35e4 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -10,10 +10,8 @@ include $(INCLUDE_DIR)/host.mk ARCH:=arm BOARD:=brcm2708 BOARDNAME:=Broadcom BCM2708/BCM2709 -FEATURES:=ext4 audio usb usbgadget display gpio +FEATURES:=ext4 audio usb usbgadget display gpio fpu MAINTAINER:=Florian Fainelli flor...@openwrt.org -CPU_TYPE:=arm1176jzf-s -CPU_SUBTYPE:=vfp SUBTARGETS:=bcm2708 bcm2709 KERNEL_PATCHVER:=4.1 diff --git a/target/linux/brcm2708/bcm2708/target.mk b/target/linux/brcm2708/bcm2708/target.mk index 10fae2f..a35ec66 100644 --- a/target/linux/brcm2708/bcm2708/target.mk +++ b/target/linux/brcm2708/bcm2708/target.mk @@ -4,6 +4,8 @@ SUBTARGET:=bcm2708 BOARDNAME:=BCM2708 based boards +CPU_TYPE:=arm1176jzf-s +CPU_SUBTYPE:=vfp define Target/Description Build firmware image for Broadcom BCM2708 SoC devices. diff --git a/target/linux/brcm2708/bcm2709/target.mk b/target/linux/brcm2708/bcm2709/target.mk index 565c12a..b910b36 100644 --- a/target/linux/brcm2708/bcm2709/target.mk +++ b/target/linux/brcm2708/bcm2709/target.mk @@ -5,7 +5,7 @@ SUBTARGET:=bcm2709 BOARDNAME:=BCM2709 based boards CPU_TYPE:=cortex-a7 -CPU_SUBTYPE:=vfp +CPU_SUBTYPE:=neon define Target/Description Build firmware image for Broadcom BCM2709 SoC devices. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] CC : ar71xx: Backport Support for the Bitmain Antminer S3
Backport of r46236 to CC : add support for the Bitmain Antminer S3 Signed-off-by: L. D. Pinney ldpin...@gmail.com --- target/linux/ar71xx/base-files/etc/diag.sh | 3 +- target/linux/ar71xx/base-files/etc/uci-defaults/01_leds | 6 target/linux/ar71xx/base-files/etc/uci-defaults/02_network | 1 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 3 ++ target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 2 ++ target/linux/ar71xx/config-3.18 | 1 + target/linux/ar71xx/files/arch/mips/ath79/mach-antminer-s3.c | 98 target/linux/ar71xx/generic/profiles/antminer.mk | 11 +++ target/linux/ar71xx/image/Makefile | 10 ++- target/linux/ar71xx/patches-3.18/905-MIPS-ath79-bitmain-antminer-s3-support.patch | 39 tools/firmware-utils/src/mktplinkfw.c | 1 + 11 files changed, 173 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 4bdb53d..843e709 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -12,7 +12,8 @@ get_status_led() { all0305) status_led=eap7660d:green:ds4 ;; - antminer-s1) + antminer-s1|\ + antminer-s3) status_led=bitmain:green:system ;; ap132) diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds index 19814f4..5126497 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds @@ -36,6 +36,12 @@ antminer-s1) ucidef_set_led_wlan wlan WLAN bitmain:green:wlan phy0tpt ;; +antminer-s3) + ucidef_set_led_wlan wlan WLAN bitmain:green:wlan phy0tpt + ucidef_set_led_default sys SYS bitmain:green:sys 0 + ucidef_set_led_default lan LAN bitmain:yellow:lan 0 + ;; + ap113) ucidef_set_led_usbdev usb USB ap113:green:usb 1-1 ;; diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network index 4fe951e..ea5ba91 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network @@ -344,6 +344,7 @@ wp543) ;; antminer-s1 |\ +antminer-s3 |\ dir-505-a1) ucidef_set_interface_lan eth1 ;; diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 8f4bb40..1aa90fe 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -110,6 +110,9 @@ tplink_board_detect() { 04440001*) model=BITMAIN ANTMINER S1 ;; + 04440003*) + model=BITMAIN ANTMINER S3 + ;; 12*) model=MERCURY MAC1200R ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index ade47fb..da4c9fa 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -299,6 +299,8 @@ platform_check_image() { return 1 ;; + antminer-s1 | \ + antminer-s3 | \ archer-c5 | \ archer-c7 | \ el-m150 | \ diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18 index 05c98eb..b051c90 100644 --- a/target/linux/ar71xx/config-3.18 +++ b/target/linux/ar71xx/config-3.18 @@ -41,6 +41,7 @@ CONFIG_ATH79_MACH_AP96=y CONFIG_ATH79_MACH_ARCHER_C7=y CONFIG_ATH79_MACH_AW_NR580=y CONFIG_ATH79_MACH_ANTMINER_S1=y +CONFIG_ATH79_MACH_ANTMINER_S3=y CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y CONFIG_ATH79_MACH_CAP4200AG=y CONFIG_ATH79_MACH_CARAMBOLA2=y diff --git a/target/linux/ar71xx/generic/profiles/antminer.mk b/target/linux/ar71xx/generic/profiles/antminer.mk index 366982c..404133b 100644 --- a/target/linux/ar71xx/generic/profiles/antminer.mk +++ b/target/linux/ar71xx/generic/profiles/antminer.mk @@ -15,3 +15,14 @@ define Profile/ANTMINER_S1/Description Package set optimized for the Bitmain Antminer S1. endef $(eval $(call Profile,ANTMINER_S1)) + +define Profile/ANTMINER_S3 + NAME:=Antminer S3 + PACKAGES:=kmod-usb-core kmod-usb2 kmod-crypto-manager kmod-i2c-gpio-custom kmod-usb-hid +endef + + +define Profile/ANTMINER_S1/Description + Package set optimized for the Bitmain
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3 target image for EPG5000
the backported EPG5000 patches caused build errors in the release branch so i reverted them. due to this EPG5000 support is currently not part of CC I just cloned git://git.openwrt.org/15.05/openwrt.git, reverted the reverts: http://git.openwrt.org/?p=15.05/openwrt.git;a=commit;h=083654c25534c0fc55ea3224781fb71e6ad29067 http://git.openwrt.org/?p=15.05/openwrt.git;a=commit;h=d42f3611913724e22aaae33d1da34d37f26cb7d4 http://git.openwrt.org/?p=15.05/openwrt.git;a=commit;h=4e318a6c103839d44af6eb9cf5052bbe74e5a202 ran make defconfig, make prereq, make menuconfig, selected EPG5000 and it builds just fine. Am I missing something here? Cheers, Christian ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] brcm63xx: switch to new image building system
On Fri, Jul 17, 2015 at 12:09 PM, Álvaro Fernández Rojas nolt...@gmail.com wrote: Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com What does this patch do? Why do we want it? Does it change anything in the generated files? Please describe what this patch does/changes. After giving this a test run, I got this warning: bash: let: kernellen=21427(stat -c%s /home/jonas/openwrt/base/bcm63xx/bin/brcm63xx/openwrt-brcm63xx-generic-livebox-vmlinux.gz): syntax error in expression (error token is (stat -c%s /home/jonas/openwrt/base/bcm63xx/bin/brcm63xx/openwrt-brcm63xx-generic-livebox-vmlinux.gz)) and consequently the livebox image script is broken. Comparing the result with the previous ones, I noticed you renamed several images (why?), and ramdisk-images are now built per device, not per dtb, which produces several identical ramdisk-kernels except by name. This needlessly increases build time and disk usage, can you please revert that to one per dtb with the old name? Code comments inline ... --- target/linux/brcm63xx/image/Makefile | 689 +-- 1 file changed, 423 insertions(+), 266 deletions(-) diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 98d1452..1fcf620 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -39,389 +39,546 @@ define Image/LimitName16 $(shell expr substr $(1) 1 16) endef -TARGET_DTBS:= -TARGET_IMAGES:= +define Image/FilesystemStrip +$(subst root.,,$(notdir $(1))) +endef + +### Kernel scripts ### +define Build/append-dtb + $(call Image/BuildDTB,../dts/$(DEVICE_DTS).dts,$@.dtb) + cat $@.dtb $@ +endef + +define Build/gzip + gzip -9 -c $@ $@.gz + mv $@.gz $@ +endef + +define Build/hcs-initramfs + $(STAGING_DIR_HOST)/bin/hcsmakeimage --magic_bytes=$(HCS_MAGIC_BYTES) \ + --rev_maj=$(HCS_REV_MAJ) --rev_min=$(HCS_REV_MIN) --input_file=$@ \ + --output_file=$@.hcs --ldaddress=$(LOADADDR) + mv $@.hcs $@ +endef + +define Build/loader-lzma + rm -rf $@.src + $(MAKE) -C lzma-loader \ + $(LOADER_MAKEOPTS) \ + PKG_BUILD_DIR=$@.src \ + TARGET_DIR=$(dir $@) \ + LOADER_DATA=$@ \ + LOADER_NAME=$(notdir $@) \ + compile loader.$(1) + mv $@.$(1) $@ + rm -rf $@.src +endef + +define Build/lzma + $(STAGING_DIR_HOST)/bin/lzma e $@ -d22 -fb64 -a1 $@.lzma + mv $@.lzma $@ +endef + +define Build/lzma-cfe + dd if=$@ of=$@.lzma.cfe bs=5 count=1 + dd if=$@ of=$@.lzma.cfe ibs=13 obs=5 skip=1 seek=1 conv=notrunc + mv $@.lzma.cfe $@ +endef -TARGET_Default_DTBS:= -TARGET_Default_IMAGES:= +define Build/relocate-kernel + ( \ + dd if=$(KDIR)/relocate/loader.bin bs=32 conv=sync \ + perl -e '@s = stat($@); print pack(N, @s[7])' \ + cat $@ \ + ) $@.relocate + mv $@.relocate $@ +endef -define Image/Build/CFEDTB - # Generate the tagged image - $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(3).lzma.cfe -f $(KDIR)/root.$(1) \ - --output $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-cfe.bin \ - --boardid $(4) --chipid $(5) --entry $(LOADER_ENTRY) \ - --load-addr $(LOADER_ENTRY) --info1 -$(call Image/LimitName16,$(2)) \ - $(call rootfspad/$(1)) \ - --info2 $(1) $(6) +### Image scripts ### +define Build/cfe-bin + $(STAGING_DIR_HOST)/bin/imagetag -i $(word 1,$^) -f $(word 2,$^) \ + --output $@ --boardid $(CFE_BOARD_ID) --chipid $(CFE_CHIP_ID) \ + --entry $(LOADER_ENTRY) --load-addr $(LOADER_ENTRY) \ + --info1 $(call Image/LimitName16,$(DEVICE_NAME)) \ + --info2 $(call Image/FilesystemStrip,$(word 2,$^)) \ + $(call rootfspad/$(call Image/FilesystemStrip,$(word 2,$^))) \ + $(CFE_EXTRAS) endef -define Image/Build/OLDCFEDTB - # Generate the tagged image +define Build/cfe-old-bin $(TOPDIR)/scripts/brcmImage.pl -t -p \ - -b $(4) -c $(5) -e $(LOADER_ENTRY) -a $(LOADER_ENTRY) \ - -k $(KDIR)/vmlinux-$(3).lzma.cfe -r $(KDIR)/root.$(1) \ - -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-cfe.bin $(6) -endef - -define Image/Build/SPW303VCFEDTB - # Generate the tagged image - $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(3).lzma.cfe -f $(KDIR)/root.$(1) \ - --output $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).tmp \ - --boardid $(4) --chipid $(5) --entry $(LOADER_ENTRY) \ -
Re: [OpenWrt-Devel] [PATCH] mvebu: update dts files for mamba / WRT1900AC
On Sat, Jul 18, 2015 at 2:06 AM, nyt-open...@countercultured.net wrote: From: notnyt nyt-open...@countercultured.net Fix for default button states in WRT1900AC dts files. This prevents overlay wipe when reset is pressed. More info at: https://forum.openwrt.org/viewtopic.php?pid=282900#p282900 Signed-off-by: notnyt nyt-open...@countercultured.net Please sign off with your real name. Regards Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages
On Fri, Jul 17, 2015 at 3:43 AM, Gert Doering g...@greenie.muc.de wrote: git send-email is what you really want. Okay, I will get email access on my development machines. Thanks for looking at the patch nevertheless. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] CC: brcm2708: Add gzip image compression
Signed-off-by: Bruno Randolf b...@einfach.org --- target/linux/brcm2708/image/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index e70bdd0..633ed88 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -28,6 +28,9 @@ define Image/Build/RaspberryPi mcopy -i $(KDIR)/boot.img $(KDIR)/Image ::kernel.img # Copy OpenWrt built kernel ./gen_rpi_sdcard_img.sh $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1).img $(KDIR)/boot.img $(KDIR)/root.$(1) \ $(CONFIG_BRCM2708_SD_BOOT_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) + ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) + gzip -9n -c $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1).img $(BIN_DIR)/$(IMG_PREFIX)-sdcard-vfat-$(1).img.gz + endif endef define Image/Build -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] RFC: Preserving smbpasswd dnsmasq.time across sysupgrade
Hi All, Before I go too far ahead with this, a couple of questions. I've noticed smbpasswd is not preserved by default across sysupgrades. Any particular reason why? Similarly I intend to produce a patch to preserve dnsmasq's new timestamp file across sysupgrades too. The next question is how? It looks like a few other packages create a subdir in 'keep.d' with a file containing a list of files that should be preserved by default. I would anticipate creating 'samba' 'dnsmasq' subdirs though the package Makefiles. A better way? Thanks, Kevin smime.p7s Description: S/MIME Cryptographic Signature ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] mvebu: update dts files for mamba / WRT1900AC
From: notnyt nyt-open...@countercultured.net Fix for default button states in WRT1900AC dts files. This prevents overlay wipe when reset is pressed. More info at: https://forum.openwrt.org/viewtopic.php?pid=282900#p282900 Signed-off-by: Rob Mosher nyt-open...@countercultured.net --- target/linux/mvebu/patches-3.18/001-add_mamba_support.patch | 4 ++-- target/linux/mvebu/patches-4.0/001-add_mamba_support.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/mvebu/patches-3.18/001-add_mamba_support.patch b/target/linux/mvebu/patches-3.18/001-add_mamba_support.patch index 437cc3a..44a1adc 100644 --- a/target/linux/mvebu/patches-3.18/001-add_mamba_support.patch +++ b/target/linux/mvebu/patches-3.18/001-add_mamba_support.patch @@ -337,13 +337,13 @@ Signed-off-by: Gregory CLEMENT gregory.clem...@free-electrons.com + button@1 { + label = WPS; + linux,code = KEY_WPS_BUTTON; -+ gpios = gpio1 0 GPIO_ACTIVE_HIGH; ++ gpios = gpio1 0 GPIO_ACTIVE_LOW; + }; + + button@2 { + label = Factory Reset Button; + linux,code = KEY_RESTART; -+ gpios = gpio1 1 GPIO_ACTIVE_HIGH; ++ gpios = gpio1 1 GPIO_ACTIVE_LOW; + }; + }; + diff --git a/target/linux/mvebu/patches-4.0/001-add_mamba_support.patch b/target/linux/mvebu/patches-4.0/001-add_mamba_support.patch index 305479a..0fc2638 100644 --- a/target/linux/mvebu/patches-4.0/001-add_mamba_support.patch +++ b/target/linux/mvebu/patches-4.0/001-add_mamba_support.patch @@ -337,13 +337,13 @@ Signed-off-by: Gregory CLEMENT gregory.clem...@free-electrons.com + button@1 { + label = WPS; + linux,code = KEY_WPS_BUTTON; -+ gpios = gpio1 0 GPIO_ACTIVE_HIGH; ++ gpios = gpio1 0 GPIO_ACTIVE_LOW; + }; + + button@2 { + label = Factory Reset Button; + linux,code = KEY_RESTART; -+ gpios = gpio1 1 GPIO_ACTIVE_HIGH; ++ gpios = gpio1 1 GPIO_ACTIVE_LOW; + }; + }; + -- 2.1.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel