[OpenWrt-Devel] reproducible ipk packages and building openssl with -j
Hi, two days ago the .ipk packages for the first time were tested (mostly) successfully and today https://reproducible.debian.net/openwrt/openwrt.html shows that 209 (98.5%) out of 212 built packages were reproducible in our test setup. The remaining offender is busybox, which is reproducible in Debian, see https://reproducible.debian.net/busybox So far, so very great! :-) https://jenkins.debian.net/view/reproducible/job/reproducible_openwrt/31/console shows the build from two days ago, were ramimps didnt reach 98.5% because openssl failed to build, thus causing other packages to fail to build. Just rescheduling the job "fixed" that, so I assume openssl was once again build with -j, which doesn't work reliably (according both to my experience and an openssl developer I've spoken to yesterday). That said, I do recall having seen a commit forcing "-j 1" when building openssl for openwrt, so I'm wondering whether that commit was limited to some archs only or maybe was removed again? cheers, Holger signature.asc Description: This is a digitally signed message part. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] reproducible ipk packages and building openssl with -j
On Donnerstag, 16. Juli 2015, Holger Levsen wrote: > That said, I do recall having seen a commit forcing "-j 1" when building > openssl for openwrt, so I'm wondering whether that commit was limited to > some archs only or maybe was removed again? FWIW, I ment http://git.openwrt.org/?p=openwrt.git;a=commit;h=b38dd06826ae2c0c3041dd334ffc3c0bf60055a5 signature.asc Description: This is a digitally signed message part. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] libubus-lua: fix memory leak problem
HI, all this is another patch to fix libubus's lua memory leak problem (lua stack corrupted) Best regards Signed-off-by:Chen Bin --- --- a/lua/ubus.c +++ b/lua/ubus.c @@ -302,8 +302,9 @@ ubus_method_handler(struct ubus_context lua_call(state, 2, 1); if (lua_isnumber(state, -1)) rv = lua_tonumber(state, -1); - } else - lua_pop(state, 1); + } + + lua_pop(state, 1); return rv; }___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] libubox-lua: uloop.process gc bug
HI, all this is a patch to fix libubox-lua's uloop.process gc bug:before free lua userdata proc, we may need to call uloop_process_delete first. Best regards Signed-off-by:Chen Bin --- --- a/lua/uloop.c +++ b/lua/uloop.c @@ -77,9 +77,9 @@ static int ul_timer_set(lua_State *L) static int ul_timer_free(lua_State *L) { struct lua_uloop_timeout *tout = lua_touserdata(L, 1); - + uloop_timeout_cancel(&tout->t); - + /* obj.__index.__gc = nil , make sure executing only once*/ lua_getfield(L, -1, "__index"); lua_pushstring(L, "__gc"); @@ -181,7 +181,7 @@ static int get_sock_fd(lua_State* L, int static int ul_ufd_delete(lua_State *L) { struct lua_uloop_fd *ufd = lua_touserdata(L, 1); - + uloop_fd_delete(&ufd->fd); /* obj.__index.__gc = nil , make sure executing only once*/ @@ -263,6 +263,33 @@ static int ul_ufd_add(lua_State *L) return 1; } +static int ul_process_delete(lua_State *L) +{ +struct lua_uloop_process *proc = lua_touserdata(L, 1); + +/* obj.__index.__gc = nil , make sure executing only once*/ +lua_getfield(L, -1, "__index"); +lua_pushstring(L, "__gc"); +lua_pushnil(L); +lua_settable(L, -3); + +if (proc->r != LUA_NOREF) { +uloop_process_delete(&proc->p); + +lua_getglobal(state, "__uloop_cb"); +luaL_unref(state, -1, proc->r); +lua_remove(state, -1); +} + +return 1; +} + +static const luaL_Reg uproc_m[] = { +{ "delete", ul_process_delete }, +{ NULL, NULL } +}; + + static void ul_process_cb(struct uloop_process *p, int ret) { struct lua_uloop_process *proc = container_of(p, struct lua_uloop_process, p); @@ -271,6 +298,7 @@ static void ul_process_cb(struct uloop_p lua_rawgeti(state, -1, proc->r); luaL_unref(state, -2, proc->r); +proc->r = LUA_NOREF; lua_remove(state, -2); lua_pushinteger(state, ret >> 8); lua_call(state, 1, 0); @@ -331,6 +359,18 @@ static int ul_process(lua_State *L) ref = luaL_ref(L, -2); proc = lua_newuserdata(L, sizeof(*proc)); +lua_createtable(L, 0, 2); +lua_pushvalue(L, -1); +lua_setfield(L, -2, "__index"); +lua_pushcfunction(L, ul_process_delete); +lua_setfield(L, -2, "__gc"); +lua_pushvalue(L, -1); +lua_setmetatable(L, -3); +lua_pushvalue(L, -2); +luaI_openlib(L, NULL, uproc_m, 1); +lua_pushvalue(L, -2); + + memset(proc, 0, sizeof(*proc)); proc->r = ref;___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH V2] brcm63xx: HG553 buttons support
Hi, On Wed, Jul 15, 2015 at 10:38 PM, Rafał Miłecki wrote: > On 15 July 2015 at 18:34, Cezary Jackiewicz > wrote: >> This patch adds buttons support for Huawei EchoLife HG553. >> Changes: >> - add empty line... >> - change codes to hexadecimal > > You usually want to put version comments in the comments part. Having > above won't make too much sense when browsing log in the future. > >> >> Signed-off-by: Cezary Jackiewicz >> --- > > Right here is a perfect place for any comments :) What Rafał said - but for the next patch; I decided to just apply it and fix it up myself, so you don't have to rebase it. Applied in r46388. Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] brcm63xx: HG553 buttons support
On Wed, Jul 15, 2015 at 12:25 PM, John Crispin wrote: > On 15/07/2015 12:23, Jonas Gorski wrote: >> On Wed, Jul 15, 2015 at 7:59 AM, Rafał Miłecki wrote: >>> On 15 July 2015 at 07:05, Cezary Jackiewicz >>> wrote: @@ -6,6 +6,25 @@ model = "Huawei EchoLife HG553"; compatible = "huawei,hg553", "brcm,bcm6358"; + gpio-keys-polled { + compatible = "gpio-keys-polled"; + #address-cells = <1>; + #size-cells = <0>; + poll-interval = <20>; + debounce-interval = <60>; + + rfkill { + label = "rfkill"; + gpios = <&gpio0 9 1>; + linux,code = <247>; + }; + reset { + label = "reset"; + gpios = <&gpio1 5 1>; + linux,code = <0x198>; + }; + }; >>> >>> I really think you bcm63xx guys should start using KEY_* at some point :) >> >> The dts files are built out of tree, so we currently don't have access >> to dt-includes. >> > > i have the same problem on ramips/lantiq so maybe we should make the > headers available in trunk in some way. while porting the new mediatek > arm soc i noticed that the header includes make the dts files more readable. I just copied the CPP invocation from the kernel (without the dependency tracking) and added it as a new define which works at least for me, see r46389, r46390, r46391. Hopefully I got all usecases covered (I saw ppc passes some extra dtc flags). Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] hostapd: fix #18197, no auth server (BB)
(++attempts) As described in [1], there was a bug in hostapd introduced in version 2.2 that makes hostapd lose its RADIUS configuration if the initial connection attempt failed. This is serious, because it effectively renders WPA-Enterprise authentication unuseable. When the network interfaces are brought up, the wired connection most likely does not have a dhcp lease yet. The bug was fixed upstream, however the version used in Barrier Breaker still has it. More information in the upstream commit [2]. The included patch (git diff) simply applies the upstream patch using quilt. Tested successfully by me with the latest Barrier Breaker from git on a WNDR3800. Best Regards Leon [1] https://dev.openwrt.org/ticket/18197 [2] https://w1.fi/cgit/hostap/commit/src/radius/radius_client.c?id=94b39e5927e570e6b0fe41d455dde0a361c71c36 Signed-off-by: Leon Merten Lohse diff --git a/package/network/services/hostapd/patches/700-radius_reconnect.patch b/package/network/services/hostapd/patches/700-radius_reconnect.patch new file mode 100644 index 000..acc9804 --- /dev/null +++ b/package/network/services/hostapd/patches/700-radius_reconnect.patch @@ -0,0 +1,22 @@ +--- a/src/radius/radius_client.c b/src/radius/radius_client.c +@@ -658,6 +658,9 @@ int radius_client_send(struct radius_cli + } + + if (msg_type == RADIUS_ACCT || msg_type == RADIUS_ACCT_INTERIM) { ++ if (conf->acct_server && radius->acct_sock < 0) ++ radius_client_init_acct(radius); ++ + if (conf->acct_server == NULL || radius->acct_sock < 0) { + hostapd_logger(radius->ctx, NULL, + HOSTAPD_MODULE_RADIUS, +@@ -672,6 +675,9 @@ int radius_client_send(struct radius_cli + s = radius->acct_sock; + conf->acct_server->requests++; + } else { ++ if (conf->auth_server && radius->auth_sock < 0) ++ radius_client_init_auth(radius); ++ + if (conf->auth_server == NULL || radius->auth_sock < 0) { + hostapd_logger(radius->ctx, NULL, + HOSTAPD_MODULE_RADIUS, ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] hostapd: fix #18197, no auth server (BB)
On 2015-07-16 14:36, Leon Merten Lohse wrote: > (++attempts) > > As described in [1], there was a bug in hostapd introduced in version > 2.2 that > makes hostapd lose its RADIUS configuration if the initial connection > attempt > failed. > This is serious, because it effectively renders WPA-Enterprise > authentication > unuseable. When the network interfaces are brought up, the wired > connection > most likely does not have a dhcp lease yet. > The bug was fixed upstream, however the version used in Barrier Breaker > still has > it. More information in the upstream commit [2]. > > The included patch (git diff) simply applies the upstream patch using > quilt. > Tested successfully by me with the latest Barrier Breaker from git on a > WNDR3800. The patch is line wrapped. Please fix and resend. - Felix ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Chaos Calmer 15.05-rc3
The OpenWrt developers are proud to announce the third release candidate of OpenWrt Chaos Calmer. ___ __ | |.-.-.-.| | | |..| |_ | - || _ | -__| || | | || _|| _| |___|| __|_|__|__||||__| || |__| W I R E L E S S F R E E D O M - CHAOS CALMER (15.05 RC3) - * 1 1/2 oz GinShake with a glassful * 1/4 oz Triple Sec of broken ice and pour * 3/4 oz Lime Juice unstrained into a goblet. * 1 1/2 oz Orange Juice * 1 tsp. Grenadine Syrup - - http://downloads.openwrt.org/chaos_calmer/15.05-rc3/ ** Improvements since RC 2 ** * brcmfmac: support for BCM43602 * mt76: updated version with new firmware support, TX & DMA fixes * Updated 3.18 to 3.18.18 * Fixed image builder generation * Various security updates (e.g. openssl, curl) * Minor fixes ** Improvements since RC 1 ** * Fixed broken ImageBuilders for most targets * Updated 3.18 to 3.18.14 * Fixed broken IPv6 downstream DHCPv6-PD and onlink-route handling * Images (special format) for Asus brcm47xx and bcm53xx devices * Improved stability of sysupgrade on brcm47xx and bcm53xx * Added HTTPS enforcement option to uhttpd * Fixed umask issue * Added support for a few new boards ** Highlights since Barrier Breaker ** * Linux kernel updated to version 3.18 * Improved Security Features - Rewritten package signing architecture based on ed25519 - Added support for jails - Added support for hardened builds * Improved Networking Support - Added or improved support for lots of 3G/4G modems (MBIM, QMI, NCM, ...) - Added support for 464XLAT (CLAT) [RFC 6877 + RFC 7050] - Netfilter performance enhancements (conntrack route cache) - Improved support for self-managing networks [draft-ietf-homenet-hncp] - Better multi-core support for the network stack - Improved support for MAP-E, MAP-T and LW4over6 IPv4 transitioning technologies [draft-ietf-softwire-map, -map-t, -map-dhcp, -lw4over6] - Improved network auto-setup capable of detecting and bootstrapping IPv4-only, 6rd, Dual-Stack, IPv6-only, DS-Lite, LW4over6, MAP-E, MAP-T, 464XLAT and combinations without explicit configuration [based on RFC 7084] - Added support for Smart Queue Management (SQM) QoS, AQM and Traffic Shaping - Improved support for DNSSEC * Platform and Driver Support - Added support for feeds of externally maintained targets - New mt7621 subtarget for Mediatek 11ac SoC - New mt76 mac80211 based wifi driver for MTK 11ac cores. - New mwlwifi mac80211 based wifi driver for the Marvell 88W8864 - New bcm53xx target for Broadcom ARM BCM47xx/53xx devices - New mxs target for Freescale i.MX23/28 family and various boards - New sunxi target for AllWinner A10/A13/A20 family and various boards - brcm2708: support for Raspberry Pi 2 - brcm63xx: support for BCM6318 and BCM63268 family - brcm63xx: improved fallback sprom support with bcma support - New ipq806x target for QCA IPQ806x SoC family * Known Issues - KALLSYMS is active causing some devices to fail And lots and lots of other advancements... As always a big thank you goes to all our active package maintainers, testers, supporters and documenters. Have fun! The OpenWrt developer team ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
Sorry, small mistake. Kernel is 3.18.17 in RC3. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
which is the exact git hash of the RC3 release ? Thank you in advance Kind Regards, Arturo ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
On Jul 16, 2015 10:40 PM, "Steven Barth" wrote: > > The OpenWrt developers are proud to announce the third release candidate of OpenWrt Chaos Calmer. > Thanks, guys. regards yousong >___ __ > | |.-.-.-.| | | |..| |_ > | - || _ | -__| || | | || _|| _| > |___|| __|_|__|__||||__| || > |__| W I R E L E S S F R E E D O M > - > CHAOS CALMER (15.05 RC3) > - > * 1 1/2 oz GinShake with a glassful > * 1/4 oz Triple Sec of broken ice and pour > * 3/4 oz Lime Juice unstrained into a goblet. > * 1 1/2 oz Orange Juice > * 1 tsp. Grenadine Syrup > - > > - > http://downloads.openwrt.org/chaos_calmer/15.05-rc3/ > > ** Improvements since RC 2 ** > * brcmfmac: support for BCM43602 > * mt76: updated version with new firmware support, TX & DMA fixes > * Updated 3.18 to 3.18.18 > * Fixed image builder generation > * Various security updates (e.g. openssl, curl) > * Minor fixes > > ** Improvements since RC 1 ** > * Fixed broken ImageBuilders for most targets > * Updated 3.18 to 3.18.14 > * Fixed broken IPv6 downstream DHCPv6-PD and onlink-route handling > * Images (special format) for Asus brcm47xx and bcm53xx devices > * Improved stability of sysupgrade on brcm47xx and bcm53xx > * Added HTTPS enforcement option to uhttpd > * Fixed umask issue > * Added support for a few new boards > > > ** Highlights since Barrier Breaker ** > > * Linux kernel updated to version 3.18 > * Improved Security Features > - Rewritten package signing architecture based on ed25519 > - Added support for jails > - Added support for hardened builds > * Improved Networking Support > - Added or improved support for lots of 3G/4G modems (MBIM, QMI, NCM, ...) > - Added support for 464XLAT (CLAT) [RFC 6877 + RFC 7050] > - Netfilter performance enhancements (conntrack route cache) > - Improved support for self-managing networks [draft-ietf-homenet-hncp] > - Better multi-core support for the network stack > - Improved support for MAP-E, MAP-T and LW4over6 IPv4 transitioning technologies > [draft-ietf-softwire-map, -map-t, -map-dhcp, -lw4over6] > - Improved network auto-setup capable of detecting and bootstrapping IPv4-only, > 6rd, Dual-Stack, IPv6-only, DS-Lite, LW4over6, MAP-E, MAP-T, 464XLAT > and combinations without explicit configuration [based on RFC 7084] > - Added support for Smart Queue Management (SQM) QoS, AQM and Traffic Shaping > - Improved support for DNSSEC > * Platform and Driver Support > - Added support for feeds of externally maintained targets > - New mt7621 subtarget for Mediatek 11ac SoC > - New mt76 mac80211 based wifi driver for MTK 11ac cores. > - New mwlwifi mac80211 based wifi driver for the Marvell 88W8864 > - New bcm53xx target for Broadcom ARM BCM47xx/53xx devices > - New mxs target for Freescale i.MX23/28 family and various boards > - New sunxi target for AllWinner A10/A13/A20 family and various boards > - brcm2708: support for Raspberry Pi 2 > - brcm63xx: support for BCM6318 and BCM63268 family > - brcm63xx: improved fallback sprom support with bcma support > - New ipq806x target for QCA IPQ806x SoC family > > * Known Issues > - KALLSYMS is active causing some devices to fail > > And lots and lots of other advancements... > As always a big thank you goes to all our active package maintainers, testers, supporters and documenters. > > > Have fun! > The OpenWrt developer team > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
AQM inflexible, overly complex set 2015-07-16 23:02 GMT+08:00 Yousong Zhou : > > On Jul 16, 2015 10:40 PM, "Steven Barth" wrote: >> >> The OpenWrt developers are proud to announce the third release candidate >> of OpenWrt Chaos Calmer. >> > > Thanks, guys. > > regards > > yousong > >>___ __ >> | |.-.-.-.| | | |..| |_ >> | - || _ | -__| || | | || _|| _| >> |___|| __|_|__|__||||__| || >> |__| W I R E L E S S F R E E D O M >> - >> CHAOS CALMER (15.05 RC3) >> - >> * 1 1/2 oz GinShake with a glassful >> * 1/4 oz Triple Sec of broken ice and pour >> * 3/4 oz Lime Juice unstrained into a goblet. >> * 1 1/2 oz Orange Juice >> * 1 tsp. Grenadine Syrup >> - >> >> - >> http://downloads.openwrt.org/chaos_calmer/15.05-rc3/ >> >> ** Improvements since RC 2 ** >> * brcmfmac: support for BCM43602 >> * mt76: updated version with new firmware support, TX & DMA fixes >> * Updated 3.18 to 3.18.18 >> * Fixed image builder generation >> * Various security updates (e.g. openssl, curl) >> * Minor fixes >> >> ** Improvements since RC 1 ** >> * Fixed broken ImageBuilders for most targets >> * Updated 3.18 to 3.18.14 >> * Fixed broken IPv6 downstream DHCPv6-PD and onlink-route handling >> * Images (special format) for Asus brcm47xx and bcm53xx devices >> * Improved stability of sysupgrade on brcm47xx and bcm53xx >> * Added HTTPS enforcement option to uhttpd >> * Fixed umask issue >> * Added support for a few new boards >> >> >> ** Highlights since Barrier Breaker ** >> >> * Linux kernel updated to version 3.18 >> * Improved Security Features >> - Rewritten package signing architecture based on ed25519 >> - Added support for jails >> - Added support for hardened builds >> * Improved Networking Support >> - Added or improved support for lots of 3G/4G modems (MBIM, QMI, NCM, >> ...) >> - Added support for 464XLAT (CLAT) [RFC 6877 + RFC 7050] >> - Netfilter performance enhancements (conntrack route cache) >> - Improved support for self-managing networks >> [draft-ietf-homenet-hncp] >> - Better multi-core support for the network stack >> - Improved support for MAP-E, MAP-T and LW4over6 IPv4 transitioning >> technologies >> [draft-ietf-softwire-map, -map-t, -map-dhcp, -lw4over6] >> - Improved network auto-setup capable of detecting and bootstrapping >> IPv4-only, >> 6rd, Dual-Stack, IPv6-only, DS-Lite, LW4over6, MAP-E, MAP-T, 464XLAT >> and combinations without explicit configuration [based on RFC 7084] >> - Added support for Smart Queue Management (SQM) QoS, AQM and Traffic >> Shaping >> - Improved support for DNSSEC >> * Platform and Driver Support >> - Added support for feeds of externally maintained targets >> - New mt7621 subtarget for Mediatek 11ac SoC >> - New mt76 mac80211 based wifi driver for MTK 11ac cores. >> - New mwlwifi mac80211 based wifi driver for the Marvell 88W8864 >> - New bcm53xx target for Broadcom ARM BCM47xx/53xx devices >> - New mxs target for Freescale i.MX23/28 family and various boards >> - New sunxi target for AllWinner A10/A13/A20 family and various boards >> - brcm2708: support for Raspberry Pi 2 >> - brcm63xx: support for BCM6318 and BCM63268 family >> - brcm63xx: improved fallback sprom support with bcma support >> - New ipq806x target for QCA IPQ806x SoC family >> >> * Known Issues >> - KALLSYMS is active causing some devices to fail >> >> And lots and lots of other advancements... >> As always a big thank you goes to all our active package maintainers, >> testers, supporters and documenters. >> >> >> Have fun! >> The OpenWrt developer team >> ___ >> openwrt-devel mailing list >> openwrt-devel@lists.openwrt.org >> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/9] brcm2708: improve profiles and image generation
- Add profiles for bcm2708 subtarget. - Check subtarget for image generation. Signed-off-by: Álvaro Fernández Rojas --- v2: resend .../linux/brcm2708/bcm2708/profiles/RaspberryPi.mk | 22 ++ .../brcm2708/bcm2709/profiles/RaspberryPi2.mk | 12 +--- target/linux/brcm2708/image/Makefile | 19 +-- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk b/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk index 94d0a06..82a7910 100644 --- a/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk +++ b/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk @@ -5,12 +5,26 @@ # See /LICENSE for more information. # -define Profile/RaspberryPi +define Profile/Default NAME:=Raspberry Pi endef +define Profile/Default/Description + Raspberry Pi +endef +$(eval $(call Profile,Default)) -define Profile/RaspberryPi/Description - Raspberry Pi board +define Profile/RaspberryPi_B + NAME:=Raspberry Pi Model B +endef +define Profile/RaspberryPi_B/Description + Raspberry Pi Model B endef +$(eval $(call Profile,RaspberryPi_B)) -$(eval $(call Profile,RaspberryPi)) +define Profile/RaspberryPi_BPlus + NAME:=Raspberry Pi Model B+ +endef +define Profile/RaspberryPi_BPlus/Description + Raspberry Pi Model B+ +endef +$(eval $(call Profile,RaspberryPi_BPlus)) diff --git a/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk b/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk index d3d1617..ef7483d 100644 --- a/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk +++ b/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk @@ -5,12 +5,10 @@ # See /LICENSE for more information. # -define Profile/RaspberryPi2 - NAME:=Raspberry Pi 2 +define Profile/RaspberryPi_2 + NAME:=Raspberry Pi 2 Model B endef - -define Profile/RaspberryPi2/Description - Raspberry Pi 2 board +define Profile/RaspberryPi_2/Description + Raspberry Pi 2 Model B endef - -$(eval $(call Profile,RaspberryPi2)) +$(eval $(call Profile,RaspberryPi_2)) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index 10ecfda..00bee22 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -67,11 +67,18 @@ define add_bcm2708 TARGET_DEVICES += $(2) endef -# Raspberry Pi Model B -$(eval $(call add_bcm2708,RaspberryPi,rpi-b,bcm2708-rpi-b)) -# Raspberry Pi Model B+ -$(eval $(call add_bcm2708,RaspberryPi,rpi-b-plus,bcm2708-rpi-b-plus)) -# Raspberry Pi 2 Model B -$(eval $(call add_bcm2708,RaspberryPi2,rpi-2-b,bcm2709-rpi-2-b)) +### BCM2708/BCM2835 ### +ifeq ($(SUBTARGET),bcm2708) + # Raspberry Pi Model B + $(eval $(call add_bcm2708,RaspberryPi_B,rpi-b,bcm2708-rpi-b)) + # Raspberry Pi Model B+ + $(eval $(call add_bcm2708,RaspberryPi_BPlus,rpi-b-plus,bcm2708-rpi-b-plus)) +endif + +### BCM2709/BCM2836 ### +ifeq ($(SUBTARGET),bcm2709) + # Raspberry Pi 2 Model B + $(eval $(call add_bcm2708,RaspberryPi_2,rpi-2-b,bcm2709-rpi-2-b)) +endif $(eval $(call BuildImage)) -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/9] brcm2708: split target config into subtargets
Signed-off-by: Álvaro Fernández Rojas --- v2: resend target/linux/brcm2708/bcm2708/config-3.18| 326 target/linux/brcm2708/bcm2708/config-default | 4 - target/linux/brcm2708/bcm2709/config-3.18| 358 +++ target/linux/brcm2708/bcm2709/config-default | 17 -- target/linux/brcm2708/config-3.18| 280 - 5 files changed, 684 insertions(+), 301 deletions(-) create mode 100644 target/linux/brcm2708/bcm2708/config-3.18 delete mode 100644 target/linux/brcm2708/bcm2708/config-default create mode 100644 target/linux/brcm2708/bcm2709/config-3.18 delete mode 100644 target/linux/brcm2708/bcm2709/config-default delete mode 100644 target/linux/brcm2708/config-3.18 diff --git a/target/linux/brcm2708/bcm2708/config-3.18 b/target/linux/brcm2708/bcm2708/config-3.18 new file mode 100644 index 000..82097c2 --- /dev/null +++ b/target/linux/brcm2708/bcm2708/config-3.18 @@ -0,0 +1,326 @@ +# CONFIG_AIO is not set +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_AMBA_PL08X is not set +# CONFIG_APM_EMULATION is not set +CONFIG_ARCH_BCM2708=y +# CONFIG_ARCH_BCM2709 is not set +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +# CONFIG_ARCH_HAS_SG_CHAIN is not set +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARM=y +CONFIG_ARM_AMBA=y +CONFIG_ARM_CPU_SUSPEND=y +CONFIG_ARM_ERRATA_411920=y +CONFIG_ARM_L1_CACHE_SHIFT=5 +# CONFIG_ARM_SP805_WATCHDOG is not set +CONFIG_ARM_THUMB=y +CONFIG_ARM_UNWIND=y +CONFIG_AVERAGE=y +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BCM2708_DT=y +CONFIG_BCM2708_GPIO=y +# CONFIG_BCM2708_NOL2CACHE is not set +CONFIG_BCM2708_VCHIQ=y +CONFIG_BCM2708_VCMEM=y +CONFIG_BCM2708_WDT=y +CONFIG_BCM_VC_CMA=y +CONFIG_BCM_VC_SM=y +# CONFIG_BLK_DEV_INITRD is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_SD=y +CONFIG_BRCM_CHAR_DRIVERS=y +CONFIG_BUILD_BIN2C=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_CMA=y +CONFIG_CMA_ALIGNMENT=8 +CONFIG_CMA_AREAS=7 +# CONFIG_CMA_DEBUG is not set +CONFIG_CMA_SIZE_MBYTES=16 +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" +CONFIG_COMMON_CLK=y +CONFIG_CONFIGFS_FS=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_CPU_32v6=y +CONFIG_CPU_ABRT_EV6=y +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_CPU_CACHE_V6=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_HAS_ASID=y +# CONFIG_CPU_ICACHE_DISABLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CPU_PABRT_V6=y +CONFIG_CPU_PM=y +CONFIG_CPU_TLB_V6=y +CONFIG_CPU_V6=y +CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_UART_8250 is not set +# CONFIG_DEBUG_UART_PL01X is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEVTMPFS=y +CONFIG_DMADEVICES=y +CONFIG_DMA_BCM2708=y +CONFIG_DMA_CMA=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y +CONFIG_DMA_VIRTUAL_CHANNELS=y +CONFIG_DNOTIFY=y +CONFIG_DTC=y +CONFIG_DUMMY_CONSOLE=y +# CONFIG_DW_DMAC_CORE is not set +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_FS_POSIX_ACL=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_FB=y +CONFIG_FB_BCM2708=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_CMDLINE=y +CONFIG_FIQ=y +CONFIG_FIRMWARE_IN_KERNEL=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +CONFIG_FONT_SUPPORT=y +# CONFIG_FPE_FASTFPE is not set +# CONFIG_FPE_NWFPE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FREEZER=y +CONFIG_FS_MBCACHE=y +CONFIG_FS_POSIX_ACL=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_PINCONF=y +CONFIG_GENE
[OpenWrt-Devel] [PATCH 2/9] brcm2708: remove unneeded base-files
Device tree exports board name/model and device LEDs. Signed-off-by: Álvaro Fernández Rojas --- .../brcm2708/base-files/etc/uci-defaults/01_leds | 11 --- target/linux/brcm2708/base-files/lib/brcm2708.sh | 36 -- .../lib/preinit/03_preinit_do_brcm2708.sh | 9 -- 3 files changed, 56 deletions(-) delete mode 100644 target/linux/brcm2708/base-files/etc/uci-defaults/01_leds delete mode 100755 target/linux/brcm2708/base-files/lib/brcm2708.sh delete mode 100644 target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh diff --git a/target/linux/brcm2708/base-files/etc/uci-defaults/01_leds b/target/linux/brcm2708/base-files/etc/uci-defaults/01_leds deleted file mode 100644 index ad52c68..000 --- a/target/linux/brcm2708/base-files/etc/uci-defaults/01_leds +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 OpenWrt.org -# - -. /lib/functions/uci-defaults.sh - -ucidef_set_led_mmc "mmc" "MMC" "led0" "mmc0" -ucidef_commit_leds - -exit 0 diff --git a/target/linux/brcm2708/base-files/lib/brcm2708.sh b/target/linux/brcm2708/base-files/lib/brcm2708.sh deleted file mode 100755 index 76870c6..000 --- a/target/linux/brcm2708/base-files/lib/brcm2708.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 OpenWrt.org -# - -brcm2708_board_detect() { - local machine - local name - - machine=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /Hardware/ {print $2}' /proc/cpuinfo) - - case "$machine" in - BCM2708) - name="Raspberry Pi" - ;; - BCM2709) - name="Raspberry Pi 2" - ;; - esac - - [ -z "$name" ] && name="unknown" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$machine" > /tmp/sysinfo/board_name - echo "$name" > /tmp/sysinfo/model -} - -brcm2708_board_name() { - local name - - [ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name) - [ -z "$name" ] && name="unknown" - - echo "$name" -} diff --git a/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh b/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh deleted file mode 100644 index e3cf56d..000 --- a/target/linux/brcm2708/base-files/lib/preinit/03_preinit_do_brcm2708.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -do_brcm2708() { - . /lib/brcm2708.sh - - brcm2708_board_detect -} - -boot_hook_add preinit_main do_brcm2708 -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 5/9] generic: add missing linux 4.1 symbols
Signed-off-by: Álvaro Fernández Rojas --- v2: resend target/linux/generic/config-4.1 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1 index 0712808..2dd4071 100644 --- a/target/linux/generic/config-4.1 +++ b/target/linux/generic/config-4.1 @@ -107,6 +107,7 @@ CONFIG_AIO=y # CONFIG_ALCHEMY_GPIO_INDIRECT is not set # CONFIG_ALIM7101_WDT is not set CONFIG_ALLOW_DEV_COREDUMP=y +# CONFIG_ALTERA_MBOX is not set # CONFIG_ALTERA_STAPL is not set # CONFIG_ALTERA_TSE is not set # CONFIG_ALX is not set @@ -251,6 +252,7 @@ CONFIG_ARM_DMA_MEM_BUFFERABLE=y # CONFIG_ARM_ERRATA_798181 is not set # CONFIG_ARM_KERNMEM_PERMS is not set # CONFIG_ARM_KPROBES_TEST is not set +# CONFIG_ARM_MHU is not set # CONFIG_ARM_PATCH_PHYS_VIRT is not set # CONFIG_ARM_PSCI is not set # CONFIG_ARM_PTDUMP is not set @@ -1011,6 +1013,7 @@ CONFIG_EXPERT=y # CONFIG_EXT3_FS is not set # CONFIG_EXT3_FS_XATTR is not set # CONFIG_EXT4_DEBUG is not set +# CONFIG_EXT4_ENCRYPTION is not set # CONFIG_EXT4_FS is not set # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set @@ -2928,12 +2931,14 @@ CONFIG_PCI_SYSCALL=y # CONFIG_PID_NS is not set CONFIG_PINCONF=y # CONFIG_PINCTRL is not set +# CONFIG_PINCTRL_AMD is not set # CONFIG_PINCTRL_CAPRI is not set # CONFIG_PINCTRL_EXYNOS is not set # CONFIG_PINCTRL_EXYNOS5440 is not set # CONFIG_PINCTRL_MSM8X74 is not set CONFIG_PINCTRL_SINGLE=y CONFIG_PINMUX=y +# CONFIG_PL320_MBOX is not set # CONFIG_PLAT_SPEAR is not set # CONFIG_PLIP is not set # CONFIG_PLX_HERMES is not set @@ -4511,6 +4516,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_V4L_MEM2MEM_DRIVERS is not set # CONFIG_V4L_TEST_DRIVERS is not set # CONFIG_VCNL4000 is not set +# CONFIG_VDSO is not set # CONFIG_VETH is not set # CONFIG_VEXPRESS_CONFIG is not set # CONFIG_VF610_ADC is not set -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 7/9] brcm2708: override disabled device tree module status from config.txt
Signed-off-by: Álvaro Fernández Rojas --- v2: separate patch into modules and config.txt target/linux/brcm2708/image/config.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/target/linux/brcm2708/image/config.txt b/target/linux/brcm2708/image/config.txt index 9e6e8e9..f66f6bc 100644 --- a/target/linux/brcm2708/image/config.txt +++ b/target/linux/brcm2708/image/config.txt @@ -921,3 +921,9 @@ init_uart_clock=300 ## 81.4 V ## #over_voltage_sdram_p=0 + + +## Device Tree Settings + + +dtparam=random=on,watchdog=on,audio=on,i2c0=on,i2c1=on,spi=on -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 8/9] brcm2708: switch to linux 4.1
Signed-off-by: Álvaro Fernández Rojas --- v2: resend target/linux/brcm2708/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile index 015aa9c..6d8aba0 100644 --- a/target/linux/brcm2708/Makefile +++ b/target/linux/brcm2708/Makefile @@ -16,7 +16,7 @@ CPU_TYPE:=arm1176jzf-s CPU_SUBTYPE:=vfp SUBTARGETS:=bcm2708 bcm2709 -KERNEL_PATCHVER:=3.18 +KERNEL_PATCHVER:=4.1 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835 kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 6/9] brcm2708: add upstream (bcm2835) modules and improve downstream ones (bcm2708)
Signed-off-by: Álvaro Fernández Rojas --- v2: separate patch into modules and config.txt target/linux/brcm2708/modules.mk | 71 +--- 1 file changed, 60 insertions(+), 11 deletions(-) diff --git a/target/linux/brcm2708/modules.mk b/target/linux/brcm2708/modules.mk index 408382d..3f9c118 100644 --- a/target/linux/brcm2708/modules.mk +++ b/target/linux/brcm2708/modules.mk @@ -6,7 +6,7 @@ # define KernelPackage/sound-arm-bcm2835 - TITLE:=Broadcom 2708,2835 SoC sound support + TITLE:=BCM2835 ALSA driver KCONFIG:= \ CONFIG_SND_ARM=y \ CONFIG_SND_BCM2835 \ @@ -19,14 +19,15 @@ define KernelPackage/sound-arm-bcm2835 endef define KernelPackage/sound-arm-bcm2835/description - This package contains the Broadcom 2708/2835 sound driver + This package contains the BCM2835 ALSA pcm card driver endef $(eval $(call KernelPackage,sound-arm-bcm2835)) + define KernelPackage/random-bcm2708 SUBMENU:=$(OTHER_MENU) - TITLE:=BCM2708 H/W Random Number Generator + TITLE:=BCM2708 HW Random Number Generator KCONFIG:=CONFIG_HW_RANDOM_BCM2708 FILES:=$(LINUX_DIR)/drivers/char/hw_random/bcm2708-rng.ko AUTOLOAD:=$(call AutoLoad,11,bcm2708-rng) @@ -39,14 +40,30 @@ endef $(eval $(call KernelPackage,random-bcm2708)) +define KernelPackage/random-bcm2835 + SUBMENU:=$(OTHER_MENU) + TITLE:=BCM2835 HW Random Number Generator + KCONFIG:=CONFIG_HW_RANDOM_BCM2835 + FILES:=$(LINUX_DIR)/drivers/char/hw_random/bcm2835-rng.ko + AUTOLOAD:=$(call AutoLoad,11,bcm2835-rng) + DEPENDS:=@TARGET_brcm2708 +kmod-random-core +endef + +define KernelPackage/random-bcm2835/description + This package contains the Broadcom 2835 HW random number generator driver +endef + +$(eval $(call KernelPackage,random-bcm2835)) + define KernelPackage/spi-bcm2708 SUBMENU:=$(SPI_MENU) - TITLE:=BCM2708 SPI controller driver (SPI0) - KCONFIG:=CONFIG_SPI_BCM2708 \ - CONFIG_SPI=y \ - CONFIG_SPI_MASTER=y \ - CONFIG_BCM2708_SPIDEV=y + TITLE:=BCM2708 SPI controller driver + KCONFIG:= \ +CONFIG_BCM2708_SPIDEV=n \ +CONFIG_SPI=y \ +CONFIG_SPI_BCM2708 \ +CONFIG_SPI_MASTER=y FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm2708.ko AUTOLOAD:=$(call AutoLoad,89,spi-bcm2708) DEPENDS:=@TARGET_brcm2708 @@ -58,13 +75,31 @@ endef $(eval $(call KernelPackage,spi-bcm2708)) +define KernelPackage/spi-bcm2835 + SUBMENU:=$(SPI_MENU) + TITLE:=BCM2835 SPI controller driver + KCONFIG:=\ +CONFIG_BCM2708_SPIDEV=n \ +CONFIG_SPI=y \ +CONFIG_SPI_BCM2835 \ +CONFIG_SPI_MASTER=y + FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm2835.ko + AUTOLOAD:=$(call AutoLoad,89,spi-bcm2835) + DEPENDS:=@TARGET_brcm2708 +endef + +define KernelPackage/spi-bcm2835/description + This package contains the Broadcom 2835 SPI master controller driver +endef + +$(eval $(call KernelPackage,spi-bcm2835)) + define KernelPackage/hwmon-bcm2835 TITLE:=BCM2835 HWMON driver KCONFIG:=CONFIG_SENSORS_BCM2835 FILES:=$(LINUX_DIR)/drivers/hwmon/bcm2835-hwmon.ko AUTOLOAD:=$(call AutoLoad,60,bcm2835-hwmon) - DEPENDS:=@TARGET_brcm2708 $(call AddDepends/hwmon,@TARGET_brcm2708) endef @@ -80,9 +115,8 @@ I2C_BCM2708_MODULES:=\ define KernelPackage/i2c-bcm2708 $(call i2c_defaults,$(I2C_BCM2708_MODULES),59) - KCONFIG+= \ - CONFIG_I2C_BCM2708_BAUDRATE=10 TITLE:=Broadcom BCM2708 I2C master controller driver + KCONFIG+= CONFIG_I2C_BCM2708_BAUDRATE=10 DEPENDS:=@TARGET_brcm2708 +kmod-i2c-core endef @@ -91,3 +125,18 @@ define KernelPackage/i2c-bcm2708/description endef $(eval $(call KernelPackage,i2c-bcm2708)) + +I2C_BCM2835_MODULES:=\ + CONFIG_I2C_BCM2835:drivers/i2c/busses/i2c-bcm2835 + +define KernelPackage/i2c-bcm2835 + $(call i2c_defaults,$(I2C_BCM2835_MODULES),59) + TITLE:=Broadcom BCM2835 I2C master controller driver + DEPENDS:=@TARGET_brcm2708 +kmod-i2c-core +endef + +define KernelPackage/i2c-bcm2835/description + This package contains the Broadcom 2835 I2C master controller driver +endef + +$(eval $(call KernelPackage,i2c-bcm2835)) -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 9/9] brcm2708: add Raspberry Pi Compute Module support
Signed-off-by: Álvaro Fernández Rojas --- v2: resend target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk | 8 target/linux/brcm2708/image/Makefile | 2 ++ 2 files changed, 10 insertions(+) diff --git a/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk b/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk index 82a7910..dcf6e05 100644 --- a/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk +++ b/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk @@ -28,3 +28,11 @@ define Profile/RaspberryPi_BPlus/Description Raspberry Pi Model B+ endef $(eval $(call Profile,RaspberryPi_BPlus)) + +define Profile/RaspberryPi_CM + NAME:=Raspberry Pi Compute Module +endef +define Profile/RaspberryPi_CM/Description + Raspberry Pi Model Compute Module +endef +$(eval $(call Profile,RaspberryPi_CM)) diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile index 00bee22..de178c6 100644 --- a/target/linux/brcm2708/image/Makefile +++ b/target/linux/brcm2708/image/Makefile @@ -73,6 +73,8 @@ ifeq ($(SUBTARGET),bcm2708) $(eval $(call add_bcm2708,RaspberryPi_B,rpi-b,bcm2708-rpi-b)) # Raspberry Pi Model B+ $(eval $(call add_bcm2708,RaspberryPi_BPlus,rpi-b-plus,bcm2708-rpi-b-plus)) + # Raspberry Pi Compute Module + $(eval $(call add_bcm2708,RaspberryPi_CM,rpi-cm,bcm2708-rpi-cm)) endif ### BCM2709/BCM2836 ### -- 1.9.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] router with home automation extension
Hi, I am new to this platform and is trying to set up the openwrt so that I can try to add the home automation gateway program that we are developing. The program would do : 1) it uses tcpip socket so that the phone with wifi can control the home devies via gateway,2) it uses usb to control a zigbee sink for those sensor devices using zigbee,3) it uses wifi to ontrol sensor devices that fitted with wifi,4) it generates a website so that the control of home device can be done via web access as well as check sensor status via web. Can anyone point me a direction on how to setup an openwrt using a normal PC rather than goto the target hardware for development? Thanks ---Dr. K. F. Lee - IT and Communication (HK) Ltd. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] router with home automation extension
Can anyone point me a direction on how to setup an openwrt using a normal PC rather than goto the target hardware for development? http://wiki.openwrt.org/doc/howto/build should get you started ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
Cool. Does this "Fixed broken IPv6 downstream DHCPv6-PD and onlink-route handling" fix the issue with loosing the default gateway for IPv6 and only fixing when you reboot the router ? Fernando On 16/07/2015 11:39, Steven Barth wrote: The OpenWrt developers are proud to announce the third release candidate of OpenWrt Chaos Calmer. ___ __ | |.-.-.-.| | | |..| |_ | - || _ | -__| || | | || _|| _| |___|| __|_|__|__||||__| || |__| W I R E L E S S F R E E D O M - CHAOS CALMER (15.05 RC3) - * 1 1/2 oz GinShake with a glassful * 1/4 oz Triple Sec of broken ice and pour * 3/4 oz Lime Juice unstrained into a goblet. * 1 1/2 oz Orange Juice * 1 tsp. Grenadine Syrup - - http://downloads.openwrt.org/chaos_calmer/15.05-rc3/ ** Improvements since RC 2 ** * brcmfmac: support for BCM43602 * mt76: updated version with new firmware support, TX & DMA fixes * Updated 3.18 to 3.18.18 * Fixed image builder generation * Various security updates (e.g. openssl, curl) * Minor fixes ** Improvements since RC 1 ** * Fixed broken ImageBuilders for most targets * Updated 3.18 to 3.18.14 * Fixed broken IPv6 downstream DHCPv6-PD and onlink-route handling * Images (special format) for Asus brcm47xx and bcm53xx devices * Improved stability of sysupgrade on brcm47xx and bcm53xx * Added HTTPS enforcement option to uhttpd * Fixed umask issue * Added support for a few new boards ** Highlights since Barrier Breaker ** * Linux kernel updated to version 3.18 * Improved Security Features - Rewritten package signing architecture based on ed25519 - Added support for jails - Added support for hardened builds * Improved Networking Support - Added or improved support for lots of 3G/4G modems (MBIM, QMI, NCM, ...) - Added support for 464XLAT (CLAT) [RFC 6877 + RFC 7050] - Netfilter performance enhancements (conntrack route cache) - Improved support for self-managing networks [draft-ietf-homenet-hncp] - Better multi-core support for the network stack - Improved support for MAP-E, MAP-T and LW4over6 IPv4 transitioning technologies [draft-ietf-softwire-map, -map-t, -map-dhcp, -lw4over6] - Improved network auto-setup capable of detecting and bootstrapping IPv4-only, 6rd, Dual-Stack, IPv6-only, DS-Lite, LW4over6, MAP-E, MAP-T, 464XLAT and combinations without explicit configuration [based on RFC 7084] - Added support for Smart Queue Management (SQM) QoS, AQM and Traffic Shaping - Improved support for DNSSEC * Platform and Driver Support - Added support for feeds of externally maintained targets - New mt7621 subtarget for Mediatek 11ac SoC - New mt76 mac80211 based wifi driver for MTK 11ac cores. - New mwlwifi mac80211 based wifi driver for the Marvell 88W8864 - New bcm53xx target for Broadcom ARM BCM47xx/53xx devices - New mxs target for Freescale i.MX23/28 family and various boards - New sunxi target for AllWinner A10/A13/A20 family and various boards - brcm2708: support for Raspberry Pi 2 - brcm63xx: support for BCM6318 and BCM63268 family - brcm63xx: improved fallback sprom support with bcma support - New ipq806x target for QCA IPQ806x SoC family * Known Issues - KALLSYMS is active causing some devices to fail And lots and lots of other advancements... As always a big thank you goes to all our active package maintainers, testers, supporters and documenters. Have fun! The OpenWrt developer team ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
Hi, great news the RC3 announcement. thanks a lot. On Jul 16, 2015, at 17:11 , ql li wrote: > AQM inflexible, overly complex set Could you elaborate a bit? Which AQM system do you find inflexible, qos-scripts or sqm-scripts? Complex to set up, I wonder? Both systems have a luci GUI in which all you need to do is fill in two numbers (Download and upload speed) and check one box and in sqm you also need to select the interface on which to establish AQM (then press save & apply) I wonder how it could be simpler? All the other options are basically optional and help to deal with the fact that reality is complex ;) Best Regards M. > > 2015-07-16 23:02 GMT+08:00 Yousong Zhou : >> >> On Jul 16, 2015 10:40 PM, "Steven Barth" wrote: >>> >>> The OpenWrt developers are proud to announce the third release candidate >>> of OpenWrt Chaos Calmer. >>> >> >> Thanks, guys. >> >> regards >> >>yousong >> >>> ___ __ >>> | |.-.-.-.| | | |..| |_ >>> | - || _ | -__| || | | || _|| _| >>> |___|| __|_|__|__||||__| || >>> |__| W I R E L E S S F R E E D O M >>> - >>> CHAOS CALMER (15.05 RC3) >>> - >>> * 1 1/2 oz GinShake with a glassful >>> * 1/4 oz Triple Sec of broken ice and pour >>> * 3/4 oz Lime Juice unstrained into a goblet. >>> * 1 1/2 oz Orange Juice >>> * 1 tsp. Grenadine Syrup >>> - >>> >>> - >>> http://downloads.openwrt.org/chaos_calmer/15.05-rc3/ >>> >>> ** Improvements since RC 2 ** >>> * brcmfmac: support for BCM43602 >>> * mt76: updated version with new firmware support, TX & DMA fixes >>> * Updated 3.18 to 3.18.18 >>> * Fixed image builder generation >>> * Various security updates (e.g. openssl, curl) >>> * Minor fixes >>> >>> ** Improvements since RC 1 ** >>> * Fixed broken ImageBuilders for most targets >>> * Updated 3.18 to 3.18.14 >>> * Fixed broken IPv6 downstream DHCPv6-PD and onlink-route handling >>> * Images (special format) for Asus brcm47xx and bcm53xx devices >>> * Improved stability of sysupgrade on brcm47xx and bcm53xx >>> * Added HTTPS enforcement option to uhttpd >>> * Fixed umask issue >>> * Added support for a few new boards >>> >>> >>> ** Highlights since Barrier Breaker ** >>> >>> * Linux kernel updated to version 3.18 >>> * Improved Security Features >>>- Rewritten package signing architecture based on ed25519 >>>- Added support for jails >>>- Added support for hardened builds >>> * Improved Networking Support >>>- Added or improved support for lots of 3G/4G modems (MBIM, QMI, NCM, >>> ...) >>>- Added support for 464XLAT (CLAT) [RFC 6877 + RFC 7050] >>>- Netfilter performance enhancements (conntrack route cache) >>>- Improved support for self-managing networks >>> [draft-ietf-homenet-hncp] >>>- Better multi-core support for the network stack >>>- Improved support for MAP-E, MAP-T and LW4over6 IPv4 transitioning >>> technologies >>>[draft-ietf-softwire-map, -map-t, -map-dhcp, -lw4over6] >>>- Improved network auto-setup capable of detecting and bootstrapping >>> IPv4-only, >>> 6rd, Dual-Stack, IPv6-only, DS-Lite, LW4over6, MAP-E, MAP-T, 464XLAT >>> and combinations without explicit configuration [based on RFC 7084] >>>- Added support for Smart Queue Management (SQM) QoS, AQM and Traffic >>> Shaping >>>- Improved support for DNSSEC >>> * Platform and Driver Support >>>- Added support for feeds of externally maintained targets >>>- New mt7621 subtarget for Mediatek 11ac SoC >>>- New mt76 mac80211 based wifi driver for MTK 11ac cores. >>>- New mwlwifi mac80211 based wifi driver for the Marvell 88W8864 >>>- New bcm53xx target for Broadcom ARM BCM47xx/53xx devices >>>- New mxs target for Freescale i.MX23/28 family and various boards >>>- New sunxi target for AllWinner A10/A13/A20 family and various boards >>>- brcm2708: support for Raspberry Pi 2 >>>- brcm63xx: support for BCM6318 and BCM63268 family >>>- brcm63xx: improved fallback sprom support with bcma support >>>- New ipq806x target for QCA IPQ806x SoC family >>> >>> * Known Issues >>>- KALLSYMS is active causing some devices to fail >>> >>> And lots and lots of other advancements... >>> As always a big thank you goes to all our active package maintainers, >>> testers, supporters and documenters. >>> >>> >>> Have fun! >>>The OpenWrt developer team >>> ___ >>> openwrt-devel mailing list >>> openwrt-devel@lists.openwrt.org >>> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel >> >> >> ___ >> openwrt-devel mailing list >
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
> Does this "Fixed broken IPv6 downstream DHCPv6-PD and onlink-route > handling" fix the issue with loosing the default gateway for IPv6 and > only fixing when you reboot the router ? I haven't heard of such an issue. This might be something specific to your ISP which is outside of our range or maybe not, but I would need more information such as a pcap of ICMPv6 / DHCPv6 traffic on your egress interface to figure this one out. Cheers, Steven ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
On Thu, Jul 16, 2015 at 04:39:58PM +0200, Steven Barth wrote: > The OpenWrt developers are proud to announce the third release candidate of > OpenWrt Chaos Calmer. > ... > ** Improvements since RC 2 ** > * brcmfmac: support for BCM43602 > * mt76: updated version with new firmware support, TX & DMA fixes > * Updated 3.18 to 3.18.18 > * Fixed image builder generation > * Various security updates (e.g. openssl, curl) > * Minor fixes Great to see we are getting close to the final! I noticed that though package lists are now signed, the device-specific binaries (ie. *sysupgrade*, *factory*, ...) are still not signed. For the final release, it would be great to also have those files signed, e.g. by signing the already created md5sums and sha256sums. just my 2 cents... ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
On 16/07/2015 18:31, Daniel Golle wrote: > On Thu, Jul 16, 2015 at 04:39:58PM +0200, Steven Barth wrote: >> The OpenWrt developers are proud to announce the third release candidate of >> OpenWrt Chaos Calmer. >> ... >> ** Improvements since RC 2 ** >> * brcmfmac: support for BCM43602 >> * mt76: updated version with new firmware support, TX & DMA fixes >> * Updated 3.18 to 3.18.18 >> * Fixed image builder generation >> * Various security updates (e.g. openssl, curl) >> * Minor fixes > > Great to see we are getting close to the final! > > I noticed that though package lists are now signed, the device-specific > binaries (ie. *sysupgrade*, *factory*, ...) are still not signed. > For the final release, it would be great to also have those files > signed, e.g. by signing the already created md5sums and sha256sums. > > just my 2 cents... good idea. i am considering to also backport the reproducible build patches. would need good testing though, not sure if it a good idea or not > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
please give me the exact *git commit HASH* of 15.05-rc3. I need to make my own snapshot based on that. Kind Regards, Arturo ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
On 16/07/2015 18:59, Arturo Rinaldi wrote: > please give me the exact *git commit HASH* of 15.05-rc3. I need to make > my own snapshot based on that. > > Kind Regards, Arturo > 171f0fd10830acd3259f7c229f1b65b95595f388 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Chaos Calmer 15.05 package build failures in SDK
On Thu, Jul 16, 2015 at 04:39:58PM +0200, Steven Barth wrote: > The OpenWrt developers are proud to announce the third release candidate of > OpenWrt Chaos Calmer. > ... > CHAOS CALMER (15.05 RC3) I also noticed that the SDK is still broken: * feeds.conf.default is missing git-src base git://git.openwrt.org/15.05/openwrt.git * glib2 build fails with /usr/src/OpenWrt-SDK-15.05-rc3-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64/staging_dir/host/bin/msgfmt -o af.mo af.po /usr/src/OpenWrt-SDK-15.05-rc3-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64/staging_dir/host/bin/msgfmt: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory breaking build of all dependent packages. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
after running the git 'reset' command : /$ git reset --hard 171f0fd10830acd3259f7c229f1b65b95595f388/ in the trunk directory returns me : / //fatal: Could not parse object '171f0fd10830acd3259f7c229f1b65b95595f388' /is by any chance the right commit the one updating openssl to v1.0.2.d ? Kind Regards ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05 package build failures in SDK
On Thu, Jul 16, 2015 at 07:06:34PM +0200, Daniel Golle wrote: > On Thu, Jul 16, 2015 at 04:39:58PM +0200, Steven Barth wrote: > > The OpenWrt developers are proud to announce the third release candidate of > > OpenWrt Chaos Calmer. > > ... > > CHAOS CALMER (15.05 RC3) > > I also noticed that the SDK is still broken: > * feeds.conf.default is missing >git-src base git://git.openwrt.org/15.05/openwrt.git > * glib2 build fails with > > /usr/src/OpenWrt-SDK-15.05-rc3-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64/staging_dir/host/bin/msgfmt > -o af.mo af.po > > /usr/src/OpenWrt-SDK-15.05-rc3-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64/staging_dir/host/bin/msgfmt: > error while loading shared libraries: libtinfo.so.5: cannot open shared > object file: No such file or directory >breaking build of all dependent packages. * gdbm breaks with some weird autotools version mismatch make[6]: Entering directory '/usr/src/OpenWrt-SDK-15.05-rc3-ar71xx-generic_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64/build_dir/target-mips_34kc_uClibc-0.9.33.2/gdbm-1.11/po' *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.19 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Chaos Calmer 15.05-rc3
On Thu, Jul 16, 2015 at 7:08 PM, Arturo Rinaldi wrote: > after running the git 'reset' command : > > $ git reset --hard 171f0fd10830acd3259f7c229f1b65b95595f388 > > in the trunk directory returns me : > > fatal: Could not parse object '171f0fd10830acd3259f7c229f1b65b95595f388' > > is by any chance the right commit the one updating openssl to v1.0.2.d ? AFAICT the build isn't exactly one revision; it's r46163 + r46286 (the OpenSSL update to 1.0.2d), but none of the fixes between them. the feed revisions are: luci cf2e3f6c20dbdfdc3d8c4d4115cf9c533444e61f packages 7551321fab9b5676ae7824b18a51d53be2a48cb0 mangement ab76d576a5cbcb01075757d5d8c6e1d83f1e9ffc routing f5eab926d75396d5e95d7b7eebcac34aab30f6f7 telephony 6375e2a4aaba77aacc9b2cdea18e29fafe4cd2d5 Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] hostapd: fix #18197, no auth server (BB)
On 07/16/2015 03:54 PM, Felix Fietkau wrote: The patch is line wrapped. Please fix and resend. Hope this works now. Leon diff --git a/package/network/services/hostapd/patches/700-radius_reconnect.patch b/package/network/services/hostapd/patches/700-radius_reconnect.patch new file mode 100644 index 000..acc9804 --- /dev/null +++ b/package/network/services/hostapd/patches/700-radius_reconnect.patch @@ -0,0 +1,22 @@ +--- a/src/radius/radius_client.c b/src/radius/radius_client.c +@@ -658,6 +658,9 @@ int radius_client_send(struct radius_cli + } + + if (msg_type == RADIUS_ACCT || msg_type == RADIUS_ACCT_INTERIM) { ++ if (conf->acct_server && radius->acct_sock < 0) ++ radius_client_init_acct(radius); ++ + if (conf->acct_server == NULL || radius->acct_sock < 0) { + hostapd_logger(radius->ctx, NULL, + HOSTAPD_MODULE_RADIUS, +@@ -672,6 +675,9 @@ int radius_client_send(struct radius_cli + s = radius->acct_sock; + conf->acct_server->requests++; + } else { ++ if (conf->auth_server && radius->auth_sock < 0) ++ radius_client_init_auth(radius); ++ + if (conf->auth_server == NULL || radius->auth_sock < 0) { + hostapd_logger(radius->ctx, NULL, + HOSTAPD_MODULE_RADIUS, ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] sunxi: respect CONFIG_TARGET_IMAGES_GZIP
The ext4 images are huge uncompressed. Signed-off-by: Matthias Schiffer --- target/linux/sunxi/image/Makefile | 4 1 file changed, 4 insertions(+) diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 19ab935..d3f4409 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -43,6 +43,10 @@ define Image/Build/SDCard $(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) \ $(KDIR)/uboot-sunxi-$(PROFILE)-u-boot-with-spl.bin + + ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) + gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img + endif endef define Image/Build/Profile/A10-OLinuXino-Lime -- 2.4.6 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] sunxi: fix uboot install location
Install uboot files to KERNEL_BUILD_DIR instead of BIN_DIR to fix the ImageBuilder. Similar fixes are necessary for many (all?) other uboot targets. Also remove the DTS copy command, BIN_DIR was unnecessarily cluttered with DTS files unrelated to the chosen profile. Signed-off-by: Matthias Schiffer --- package/boot/uboot-sunxi/Makefile | 15 --- target/linux/sunxi/image/Makefile | 34 +++--- 2 files changed, 15 insertions(+), 34 deletions(-) Please also backport to CC. Regards, Matthias diff --git a/package/boot/uboot-sunxi/Makefile b/package/boot/uboot-sunxi/Makefile index 14ba922..9032600 100644 --- a/package/boot/uboot-sunxi/Makefile +++ b/package/boot/uboot-sunxi/Makefile @@ -6,6 +6,7 @@ # include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=u-boot PKG_VERSION:=2015.01 @@ -16,7 +17,7 @@ PKG_SOURCE_URL:= \ PKG_MD5SUM:=7f08dc9e98a71652bd696ed6ec95 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_LICENSE:=GPL-2.0 GPL-2.0+ PKG_LICENSE_FILES:=Licenses/README @@ -136,16 +137,16 @@ define Build/Compile endef define Package/uboot/install/default - $(INSTALL_DIR) $(BIN_DIR)/uboot-$(BOARD)-$(1) $(CP) $(PKG_BUILD_DIR)/u-boot.bin \ - $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot.bin + $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-u-boot.bin $(CP) $(PKG_BUILD_DIR)/spl/sunxi-spl.bin \ - $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-spl.bin + $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-spl.bin $(CP) $(PKG_BUILD_DIR)/u-boot-sunxi-with-spl.bin \ - $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot-with-spl.bin + $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-u-boot-with-spl.bin $(CP) uEnv.txt \ - $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-uEnv.txt - mkimage -C none -A arm -T script -d $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-uEnv.txt $(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-boot.scr + $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-uEnv.txt + mkimage -C none -A arm -T script -d $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-uEnv.txt \ + $(KERNEL_BUILD_DIR)/uboot-$(BOARD)-$(1)-boot.scr endef define Package/uboot/install/template diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 6fcd61f..19ab935 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -11,28 +11,12 @@ include $(INCLUDE_DIR)/host.mk FAT32_BLOCK_SIZE=1024 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE -BOARDS:= \ - sun4i-a10-cubieboard \ - sun4i-a10-olinuxino-lime \ - sun4i-a10-pcduino \ - sun5i-a13-olinuxino \ - sun6i-a31-colombus \ - sun6i-a31-m9 \ - sun7i-a20-bananapi \ - sun7i-a20-bananapro \ - sun7i-a20-cubieboard2 \ - sun7i-a20-cubietruck \ - sun7i-a20-olinuxino-lime \ - sun7i-a20-olinuxino-micro \ - sun7i-a20-pcduino3 \ - sun7i-a20-lamobo-r1 - define Image/BuildKernel 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 @@ -42,27 +26,23 @@ define Image/BuildKernel $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \ ) endif - - $(foreach board,$(BOARDS), - $(CP) $(DTS_DIR)/$(board).dtb $(BIN_DIR)/ - ) endef define Image/Build/SDCard rm -f $(KDIR)/boot.img mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS) - - mcopy -i $(KDIR)/boot.img $(BIN_DIR)/uboot-sunxi-$(PROFILE)/$(IMG_PREFIX)-$(PROFILE)-boot.scr ::boot.scr - mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(2).dtb ::dtb + + mcopy -i $(KDIR)/boot.img $(KDIR)/uboot-sunxi-$(PROFILE)-boot.scr ::boot.scr + mcopy -i $(KDIR)/boot.img $(DTS_DIR)/$(2).dtb ::dtb mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage - + ./gen_sunxi_sdcard_img.sh \ $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img \ $(KDIR)/boot.img \ $(KDIR)/root.$(1) \ $(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) \ - $(BIN_DIR)/uboot-sunxi-$(PROFILE)/$(IMG_PREFIX)-$(PROFILE)-u-boot-with-spl.bin + $(KDIR)/uboot-sunxi-$(PROFILE)-u-boot-with-spl.bin endef define
Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages
> -Original Message- > From: Felix Fietkau [mailto:n...@openwrt.org] > Sent: Wednesday, July 15, 2015 04:09 > To: Darik Horn ; openwrt-devel@lists.openwrt.org > Subject: Re: [OpenWrt-Devel] [PATCH] buildroot: improve git submodule handling for packages > > Patch is badly whitespace mangled and does not apply. Okay, I've rebased the this patch to HEAD and am resending it with a different MUA. (First Gmail, now Outlook.) The topic branch is also available at: * https://github.com/dajhorn/openwrt/tree/patchwork_472796 $ git pull https://github.com/dajhorn/openwrt.git patchwork_472796 >From 5a3fd904c3c03ac5f4c88de2d409bb39120c86c6 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Fri, 15 May 2015 09:47:34 -0400 Subject: [PATCH] buildroot: improve git submodule handling for packages Move the `--recursive` switch from `git clone` to `git submodule` so that submodules are cloned for upstream branches where the PKG_SOURCE_VERSION commit-ish has a different .gitmodules configuration than the repository default. This is, for example, required when the master branch for a source package does not use submodules, but its topic branch for OpenWRT does. This changes the buildroot dependency from git-1.6.2 to git 1.7.12.2, which was released September 2012. Signed-off-by: Darik Horn --- include/download.mk | 5 +++-- include/prereq-build.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/download.mk b/include/download.mk index adaa2e6..d593344 100644 --- a/include/download.mk +++ b/include/download.mk @@ -88,8 +88,9 @@ define DownloadMethod/git cd $(TMP_DIR)/dl && \ rm -rf $(SUBDIR) && \ [ \! -d $(SUBDIR) ] && \ - git clone $(URL) $(SUBDIR) --recursive && \ - (cd $(SUBDIR) && git checkout $(VERSION) && git submodule update) && \ + git clone $(URL) $(SUBDIR) && \ + (cd $(SUBDIR) && git checkout $(VERSION) && \ + git submodule update --init --recursive) && \ echo "Packing checkout..." && \ rm -rf $(SUBDIR)/.git && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 211201a..c06adaf 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -144,8 +144,8 @@ $(eval $(call SetupHostCommand,python,Please install Python 2.x, \ $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \ svn --version | grep Subversion)) -$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \ - git clone 2>&1 | grep -- --recursive)) +$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \ + git submodule update --help 2>&1 | grep -- --recursive)) $(eval $(call SetupHostCommand,file,Please install the 'file' package, \ file --version 2>&1 | grep file)) -- 1.9.1 0001-buildroot-improve-git-submodule-handling-for-package.patch Description: Binary data ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel