Re: [OpenWrt-Devel] Moving all feeds to OpenWrt GitHub organisation
On Sun, 10 Aug 2014, Florian Fainelli wrote: Hello, Le 10 août 2014 09:44, Etienne Champetier champetier.etie...@gmail.com a écrit : Le 10 août 2014 18:18, Stefan Monnier monn...@iro.umontreal.ca a écrit : It would be great to have all feeds in one place, on GitHub. I think making oneself dependent upon a commercial company without paying it (i.e. without leverage) would be a mistake. Stefan We use git, the day github closes, or asks for money, or ..., we move. We dont depend on github, we use it while it's there (and free). In the mean time it helps getting the job done Also paying is no leverage, a contract can be but there are always half million clauses, and in the worst case scenario they pay you one month back We already have an infrastructure deployed which is much wider than the services offered by github. Surely we had our own administrative issues with those machines but they have been sorted now and the process is much stronger. At this point, I don't think we would be getting any advantage of using a 3rd party service, but that's just me. I agree about the value of having our own infrastructure, but since git is so powerful, what about making a clone of the feeds on github as well as the current feeds. If the original poster is correct and this will generate more patch submissions from github users, it's a significant win. If not, it doesn't cost any money and only a small amount of time. if git wasn't decentralized enough to allow for multiple instances like this, it would be a much harder decision to make. some projects that have added a presense on github (or moved there entirely) report a significant increase in patches, some report no change. For OpenWRT, I expect that most of the project would see no change, but I wouldn't be surprised to see some areas benefit. David Lang___ 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] Moving all feeds to OpenWrt GitHub organisation
Hi, On 10.08.2014 19:14, Florian Fainelli wrote: Hello, Le 10 août 2014 09:44, Etienne Champetier champetier.etie...@gmail.com mailto:champetier.etie...@gmail.com a écrit : Le 10 août 2014 18:18, Stefan Monnier monn...@iro.umontreal.ca mailto:monn...@iro.umontreal.ca a écrit : It would be great to have all feeds in one place, on GitHub. I think making oneself dependent upon a commercial company without paying it (i.e. without leverage) would be a mistake. Stefan We use git, the day github closes, or asks for money, or ..., we move. We dont depend on github, we use it while it's there (and free). In the mean time it helps getting the job done Also paying is no leverage, a contract can be but there are always half million clauses, and in the worst case scenario they pay you one month back We already have an infrastructure deployed which is much wider than the services offered by github. Surely we had our own administrative issues with those machines but they have been sorted now and the process is much stronger. At this point, I don't think we would be getting any advantage of using a 3rd party service, but that's just me. Etienne I guess the point of Stefan is not to use github because of github as webservice and/or company, but to be able to make a pull request directly and not to make it by wrapping the changes into an email. Stefan, so far I know (please correct me if I'm wrong), the development (and commitment) of openwrt is actually made on SVN (passed forward to GIT) and not directly on GIT. SVN does not have such mechanism like pull requests. If it was done fully as GIT-repository you could use the pull request feature also without using github. pull requests are a GIT feature and not a github feature. One of the github features is the fancy web-GUI around it :-) PS: I must confess that sending changes by e-mail is still new for me, but it is makable :-) If some day a direct pull request would be possible... That would be very nice. Best Regards, Claudio ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Thank you!
While perhaps not exactly within the purpose of this mailing list, I wanted to take the time to publicly thank the folks behind the new GitHub-based packages repository. I previously found OpenWrt very frustrating to contribute to, but it seems that the new work-flow is much more contributor-friendly. I would like to especially thank Ted Hess, champtar, and sbyx, who worked with me to copy/add a number of new packages in the last few weeks. I would also like to thank all of those who conceived of this new contribution model in the first place. I have been using OpenWrt for a number of years, and am very glad to see a more workable (at least from the point of view of one non-core developer) means of contributing and updating packages. Regardless of who hosts our repository, OpenWrt has a bright future. Sincerely, -- Mike Petullo :wq ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Moving all feeds to OpenWrt GitHub organisation
2014-08-10 20:14 GMT+03:00 Florian Fainelli flor...@openwrt.org: Hello, Le 10 août 2014 09:44, Etienne Champetier champetier.etie...@gmail.com a écrit : Le 10 août 2014 18:18, Stefan Monnier monn...@iro.umontreal.ca a écrit : It would be great to have all feeds in one place, on GitHub. I think making oneself dependent upon a commercial company without paying it (i.e. without leverage) would be a mistake. Stefan We use git, the day github closes, or asks for money, or ..., we move. We dont depend on github, we use it while it's there (and free). In the mean time it helps getting the job done Also paying is no leverage, a contract can be but there are always half million clauses, and in the worst case scenario they pay you one month back We already have an infrastructure deployed which is much wider than the services offered by github. Surely we had our own administrative issues with those machines but they have been sorted now and the process is much stronger. At this point, I don't think we would be getting any advantage of using a 3rd party service, but that's just me. Etienne You are talking about openwrt.org, that's down right now :) I'm only talking about the feeds here, the core should stay where it is, and nobody can offer you buildbot. My point is github is way more user friendly, and i think it's good to have more people involved on the feed part. The only must have feature of github is the pull request, but that really helps people contribute, and good luck to offer PR like on openwrt server. About openwrt trac, you should: -disable anonymous posting (useless, counterproductive, ...) -grant more write access (packages maintainer, ...) -allow the author of an issue to close his issue Etienne ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] ar71xx: Problems with USB WIFI dongles
Hi all, On Sat, Aug 9, 2014 at 12:03 PM, Kristian Evensen kristian.even...@gmail.com wrote: 2) When disconnecting any WIFI dongle, I always get a kernel oops. This happens irrespective of if the dongle is active (for example connected to network) or if I have just connected it to the router. The kernel oops looks like the following (the crash happens at the same place independent of device): [ 429.73] usb 1-1.1.5.4: USB disconnect, device number 10 [ 429.76] CPU 0 Unable to handle kernel paging request at virtual address 00100104, epc == 86e93018, ra == 86e93010 [ 429.77] Oops[#1]: [ 429.77] CPU: 0 PID: 292 Comm: khubd Not tainted 3.14.12 #4 [ 429.77] task: 878ad770 ti: 87b0c000 task.ti: 87b0c000 [ 429.77] $ 0 : 00200200 00100100 [ 429.77] $ 4 : 87b0dce0 87b0dee0 8035 0008 [ 429.77] $ 8 : 00090040 86a6a080 0020 00090040 [ 429.77] $12 : 0013 000e 0007 0001 [ 429.77] $16 : 85cc91a0 87b0dcd8 00100100 85cc91a8 [ 429.77] $20 : 85cc91a0 00200200 86948000 87b41838 [ 429.77] $24 : 80327df0 8010fe04 [ 429.77] $28 : 87b0c000 87b0dcc8 86e93010 [ 429.77] Hi: 0350 [ 429.77] Lo: 0006 [ 429.77] epc : 86e93018 ieee80211_remove_interfaces+0x128/0x1b4 [mac80211] [ 429.77] Not tainted [ 429.77] ra: 86e93010 ieee80211_remove_interfaces+0x120/0x1b4 [mac80211] [ 429.77] Status: 1100dc03 KERNEL EXL IE [ 429.77] Cause : 008c [ 429.77] BadVA : 00100104 [ 429.77] PrId : 0001974c (MIPS 74Kc) [ 429.77] Modules linked in: ath9k rtl8192se rtl8192de rtl8192cu rtl8192ce ath9k_htc ath9k_common rtl_usb rtl_pci pppoe ppp_async option iptable_nat ath9k_hw ath usb_wwan smsc95xx rtlwifi rtl8187 rt73usb rt2x00usb rt2x00lib rndis_host qmi_wwan pppox ppp_generic nf_nat_ipv4 nf_conntrack_ipv4 mac80211 ipt_MASQUERADE huawei_cdc_ncm cfg80211 cdc_ncm cdc_ether ax88179_178a asix xt_time xt_tcpudp xt_tcpmss xt_string xt_statistic xt_state xt_recent xt_quota xt_pkttype xt_owner xt_nfacct xt_nat xt_multiport xt_mark xt_mac xt_limit xt_length xt_id xt_hl xt_helper xt_ecn xt_dscp xt_conntrack xt_connmark xt_connlimit xt_connbytes xt_comment xt_addrtype xt_TCPMSS xt_REDIRECT xt_NFQUEUE xt_LOG xt_HL xt_DSCP xt_CT xt_CLASSIFY usbserial usbnet ts_kmp ts_fsm ts_bm slhc rtl8192c_common nfnetlink_queue nfnetlink_acct nf_nat_irc nf_nat_ftp nf_nat nf_defrag_ipv4 nf_conntrack_irc nf_conntrack_ftp iptable_raw iptable_mangle iptable_filter ipt_REJECT ipt_ECN ipheth ip_tables crc16 crc_itu_t crc_ccitt compat cdc_wdm cdc_acm act_connmark act_skbedit act_mirred em_u32 cls_u32 cls_tcindex cls_flow cls_route cls_fw sch_hfsc sch_ingress ledtrig_usbdev ip6t_REJECT ip6table_raw ip6table_mangle ip6table_filter ip6_tables x_tables nf_conntrack_ipv6 nf_defrag_ipv6 ifb ipv6 eeprom_93cx6 arc4 crypto_blkcipher ehci_platform ehci_hcd gpio_button_hotplug usbcore nls_base usb_common mii [ 429.77] Process khubd (pid: 292, threadinfo=87b0c000, task=878ad770, tls=) [ 429.77] Stack : 85cc93a0 86f69350 87b0dcd8 87b0dcd8 00100100 00200200 [ 429.77] 86948000 85cc8ae0 85cc9460 86b9fa20 86f69350 86e80fac [ 429.77] 0004 85cc8ae0 85cc9460 86b9fa20 85cc8ae0 86e14ddc 87b0dd1c 87b0bbd0 [ 429.77] 86b9fa20 86948000 86b9fa20 86948000 86b9fa00 87b2c580 879ff000 800def9c [ 429.77] 87b39180 80131108 86b9fa20 86f69350 87b39180 879ff000 86b9fa00 8008d734 [ 429.77] ... [ 429.77] Call Trace: [ 429.77] [86e93018] ieee80211_remove_interfaces+0x128/0x1b4 [mac80211] [ 429.77] [86e80fac] ieee80211_unregister_hw+0x3c/0xe4 [mac80211] [ 429.77] [86e14ddc] rtl_usb_disconnect+0x4c/0xf4 [rtl_usb] [ 429.77] [87b2c580] usb_deregister+0x228/0x2ec [usbcore] [ 429.77] [8008d734] __device_release_driver+0x6c/0xd0 [ 429.77] [80117f64] device_release_driver+0x28/0x40 [ 429.77] [800edffc] bus_remove_device+0xec/0x120 [ 429.77] [801176fc] device_del+0x110/0x170 [ 429.77] [87b2ad58] usb_disable_device+0xb0/0x1d8 [usbcore] [ 429.77] [87b22920] usb_disconnect+0xac/0x408 [usbcore] [ 429.77] [87b24a68] usb_reset_device+0xd28/0x15c8 [usbcore] [ 429.77] [80121c0c] do_exit+0x72c/0x744 [ 429.77] [ 429.77] [ 429.77] Code: 27a40018 8fa2001c 8fa30018 ac620004 ac43 8fb00010 3c030010 3c020020 24630100 [ 430.11] ---[ end trace 6ca2573cb8fc44d5 ]--- I did some more looking into and testing of this kernel panic and it is fixed by the following commit https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/net/mac80211/iface.c?id=87757a917b0b3c0787e0563c679762152be81312. This commit is included in 3.10-stable and the latest compat-wireless, but not in the current compat-wireless (22-5-2014) used by OpenWRT. So the problem is already solved, sorry
Re: [OpenWrt-Devel] Moving all feeds to OpenWrt GitHub organisation
We use git, the day github closes, or asks for money, or ..., we move. Notice how right after suggesting github, you suggested using its bugtracker. It's only when github closes your access that you realize you didn't stick to just using Git. Stefan ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] ar71xx: Update to 3.14 [Flash Erasing / Bandwidth ]
Hi Daniel, thanks for the hint. I will check it the next days. I'm now a bit busy. Also I noticed that TCP throughput went from 15MBit/s PPPoE to 6 MBit/s. It seems it is about codel, because all streams get the same rate, if using multiple. I jut want to share my expierence with 3.14 so the developer has some hints. Kind regards, On 10.08.2014 15:00, Daniel Golle wrote: Hi Andre, there were some changes related to fastmap, I suspect that commit c22301ad4fa0f4cf71e9c877d072e6f07a0bf682 UBI: fastmap: fix backward compatibility with image_seq or something related might cause the problem you observe. How excactly did you flash the image to the device? Cheers Daniel On Sat, Aug 09, 2014 at 08:54:42PM +0200, Andre Valentin wrote: Hi Daniel! Please take a look at this (old kernel 3.10) [3.42] UBI: attaching mtd8 to ubi0 [3.57] UBI: EOF marker found, PEBs from 105 will be erased [3.58] UBI: scanning is finished [3.61] UBI: attached mtd8 (name ubiroot, size 249 MiB) to ubi0 [3.61] UBI: PEB size: 131072 bytes (128 KiB), LEB size: 126976 bytes [3.62] UBI: min./max. I/O unit sizes: 2048/2048, sub-page size 2048 [3.63] UBI: VID header offset: 2048 (aligned 2048), data offset: 4096 [3.63] UBI: good PEBs: 1992, bad PEBs: 0, corrupted PEBs: 0 [3.64] UBI: user volume: 2, internal volumes: 1, max. volumes count: 128 [3.65] UBI: max/mean erase counter: 0/0, WL threshold: 4096, image sequence number: 975457251 [3.66] UBI: available PEBs: 791, total reserved PEBs: 1201, PEBs reserved for bad PEB handling: 40 [3.67] UBI: background thread ubi_bgt0d started, PID 274 [3.68] mtd: device 9 (rootfs) set to be root filesystem And here the new one: [3.53] UBI: auto-attach mtd8 [3.53] UBI: attaching mtd8 to ubi0 [3.85] UBI error: scan_peb: bad image sequence number 811584292 in PEB 224, expected 1326740447 [3.86] Erase counter header dump: [3.86] magic 0x55424923 [3.86] version1 [3.87] ec 1 [3.87] vid_hdr_offset 2048 [3.87] data_offset4096 [3.88] image_seq 811584292 [3.88] hdr_crc0xa455ffb3 [3.88] erase counter header hexdump: [3.89] UBI error: ubi_attach_mtd_dev: failed to attach mtd8, error -22 [3.90] UBI error: ubi_auto_attach: cannot attach mtd8 Are you sure about this? This Flash image is about 25 MiB, like the old one. So PEB 224 is in the area where ubi should erase all. Seems to me that the erasing of the additional space is not done. Also the message about the EOF marker is not displayed. Has there something changed between 3.10 and 3.14? Kind regards, André -- Mit freundlichen Grüßen, André Valentin Projektkoordination / Systemadministration MarcanT GmbH, Ravensberger Str. 10 G, D - 33602 Bielefeld Fon: +49 (521) 95945-0 | Fax -18 URL: http://www.marcant.net | http://www.global-m2m.com Geschäftsführer: Thorsten Hojas Handelsregister: AG Bielefeld, HRB 35827 USt-ID Nr.: DE 190203238 ___ CONFIDENTIALITY NOTICE The contents of this email are confidential to the ordinary user of the email address to which it was addressed and may also be privileged. If you are not the addressee of this email you may not copy, forward, disclose or otherwise use it or any part of it in any form whatsoever. If you have received this email in error please email the sender by replying to this message. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/3] build: add support for options
This patch adds support for target DEFAULT_OPTIONS and profile OPTIONS
variables. Those are simmilar to existing DEFAULT_PACKAGES and PACKAGES
but one can use them to select other options by default in menuconfig.
Signed-off-by: Luka Perkov l...@openwrt.org
---
include/target.mk | 4
scripts/metadata.pl | 12 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/include/target.mk b/include/target.mk
index e36cdd6..20179d1 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -11,6 +11,7 @@ __target_inc=1
# default device type
DEVICE_TYPE?=router
+DEFAULT_OPTIONS:=
# Default packages - the really basic set
DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd
fstools
# For router targets
@@ -56,6 +57,7 @@ extra_packages = $(if $(filter wpad-mini wpad
nas,$(1)),iwinfo)
define Profile/Default
NAME:=
+ OPTIONS:=
PACKAGES:=
endef
@@ -68,6 +70,7 @@ define Profile
DUMPINFO += \
echo Target-Profile: $(1); \
echo Target-Profile-Name: $(NAME); \
+ echo Target-Profile-Options: $(OPTIONS); \
echo Target-Profile-Packages: $(PACKAGES) $(call
extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES)); \
if [ -f ./config/profile-$(1) ]; then \
echo Target-Profile-Kconfig: yes; \
@@ -276,6 +279,7 @@ define BuildTargets/DumpCurrent
echo 'Target-Description:'; \
$(SH_FUNC) getvar $(call shvar,Target/Description); \
echo '@@'; \
+echo 'Default-Options: $(DEFAULT_OPTIONS)'; \
echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call
extra_packages,$(DEFAULT_PACKAGES))'; \
$(DUMPINFO)
$(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s
DUMP=1 SUBTARGET=$(SUBTARGET); ))
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 79f930c..d7d168d 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -58,16 +58,19 @@ sub parse_target_metadata() {
/^Linux-Release:\s*(.+)\s*$/ and $target-{release} = $1;
/^Linux-Kernel-Arch:\s*(.+)\s*$/ and $target-{karch} = $1;
/^Default-Subtarget:\s*(.+)\s*$/ and $target-{def_subtarget} =
$1;
+ /^Default-Options:\s*(.+)\s*$/ and $target-{options} = [
split(/\s+/, $1) ];
/^Default-Packages:\s*(.+)\s*$/ and $target-{packages} = [
split(/\s+/, $1) ];
/^Target-Profile:\s*(.+)\s*$/ and do {
$profile = {
id = $1,
name = $1,
+ options = [],
packages = []
};
push @{$target-{profiles}}, $profile;
};
/^Target-Profile-Name:\s*(.+)\s*$/ and $profile-{name} = $1;
+ /^Target-Profile-Options:\s*(.*)\s*$/ and $profile-{options} =
[ split(/\s+/, $1) ];
/^Target-Profile-Packages:\s*(.*)\s*$/ and $profile-{packages}
= [ split(/\s+/, $1) ];
/^Target-Profile-Description:\s*(.*)\s*/ and $profile-{desc} =
get_multiline(*FILE);
/^Target-Profile-Config:/ and $profile-{config} =
get_multiline(*FILE, \t);
@@ -83,6 +86,7 @@ sub parse_target_metadata() {
{
id = 'Default',
name = 'Default',
+ options = [],
packages = []
}
];
@@ -138,7 +142,7 @@ sub gen_kconfig_overrides() {
}
}
-sub merge_package_lists($$) {
+sub merge_lists($$) {
my $list1 = shift;
my $list2 = shift;
my @l = ();
@@ -331,7 +335,11 @@ config TARGET_$target-{conf}_$profile-{id}
$profile-{config}
EOF
$profile-{kconfig} and print \tselect
PROFILE_KCONFIG\n;
- my @pkglist = merge_package_lists($target-{packages},
$profile-{packages});
+ my @optlist = merge_lists($target-{options},
$profile-{options});
+ foreach my $opt (@optlist) {
+ print \tselect $opt\n;
+ }
+ my @pkglist = merge_lists($target-{packages},
$profile-{packages});
foreach my $pkg (@pkglist) {
print \tselect DEFAULT_$pkg\n;
$defaults{$pkg} = 1;
--
2.0.3
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/3] build: use options to add kernels/dtbs in rootfs
Use support for options to enable targets and profiles select kernel or dtb inclusion by default. Signed-off-by: Luka Perkov l...@openwrt.org --- config/Config-images.in | 49 target/linux/mxs/profiles/01-duckbill.mk | 5 +++- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/config/Config-images.in b/config/Config-images.in index 39e51e4..2509e09 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -274,44 +274,69 @@ menu Target Images you probably want the default (/dev/sda2). + config HAVE_TARGET_ROOTFS_INCLUDE_KERNEL + bool + default n + menuconfig TARGET_ROOTFS_INCLUDE_KERNEL bool Include kernel in root filesystem depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS - default n + default y if HAVE_TARGET_ROOTFS_INCLUDE_KERNEL help - Include the kernel image in the rootfs. Typically the image is placed - below /boot. + Include the kernel image in the rootfs. Typically the image + is placed below /boot. + + + if TARGET_ROOTFS_INCLUDE_KERNEL + + config HAVE_TARGET_ROOTFS_INCLUDE_UIMAGE + bool + default n config TARGET_ROOTFS_INCLUDE_UIMAGE - bool include uImage if TARGET_ROOTFS_INCLUDE_KERNEL - default y + bool include uImage + default y if HAVE_TARGET_ROOTFS_INCLUDE_UIMAGE help This option might not apply to all targets. Make sure to check target/linux/your_target/image/Makefile to see if this option will have any effect. + config HAVE_TARGET_ROOTFS_INCLUDE_ZIMAGE + bool + default n + config TARGET_ROOTFS_INCLUDE_ZIMAGE - bool include zImage if TARGET_ROOTFS_INCLUDE_KERNEL - default y + bool include zImage + default y if HAVE_TARGET_ROOTFS_INCLUDE_ZIMAGE help This option might not apply to all targets. Make sure to check target/linux/your_target/image/Makefile to see if this option will have any effect. + config HAVE_TARGET_ROOTFS_INCLUDE_FIT + bool + default n + config TARGET_ROOTFS_INCLUDE_FIT - bool include FIT if TARGET_ROOTFS_INCLUDE_KERNEL - default y + bool include FIT + default y if HAVE_TARGET_ROOTFS_INCLUDE_FIT help This option might not apply to all targets. Make sure to check target/linux/your_target/image/Makefile to see if this option will have any effect. + endif # TARGET_ROOTFS_INCLUDE_KERNEL + + config HAVE_TARGET_ROOTFS_INCLUDE_DTB + bool + default n + config TARGET_ROOTFS_INCLUDE_DTB bool Include DTB in root filesystem depends on USES_DEVICETREE (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS) - default n + default y if HAVE_TARGET_ROOTFS_INCLUDE_DTB help - Include the device tree blob file(s) in the rootfs. Typically the DTBs - are placed below /boot. + Include the device tree blob file(s) in the rootfs. Typically + the DTBs are placed below /boot. endmenu diff --git a/target/linux/mxs/profiles/01-duckbill.mk b/target/linux/mxs/profiles/01-duckbill.mk index 3f75a7a..ac3206d 100644 --- a/target/linux/mxs/profiles/01-duckbill.mk +++ b/target/linux/mxs/profiles/01-duckbill.mk @@ -7,8 +7,11 @@ define Profile/duckbill NAME:=I2SE Duckbill boards - DEPENDS:=+@TARGET_ROOTFS_INCLUDE_KERNEL +@TARGET_ROOTFS_INCLUDE_DTB FEATURES+=usbgadget + OPTIONS:= \ + HAVE_TARGET_ROOTFS_INCLUDE_KERNEL \ + HAVE_TARGET_ROOTFS_INCLUDE_ZIMAGE \ + HAVE_TARGET_ROOTFS_INCLUDE_DTB PACKAGES+= \ -dnsmasq -firewall -ppp -ip6tables -iptables -6relayd -mtd uboot-envtools \ kmod-leds-gpio kmod-ledtrig-timer kmod-usb-mxs-phy -kmod-ipt-nathelper -- 2.0.3 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 3/3] imx6: ventana: by default include uimage and dtb in rootfs
Signed-off-by: Luka Perkov l...@openwrt.org --- target/linux/imx6/profiles/120-gateworks.mk | 4 1 file changed, 4 insertions(+) diff --git a/target/linux/imx6/profiles/120-gateworks.mk b/target/linux/imx6/profiles/120-gateworks.mk index d64a0bd..7257ab8 100644 --- a/target/linux/imx6/profiles/120-gateworks.mk +++ b/target/linux/imx6/profiles/120-gateworks.mk @@ -7,6 +7,10 @@ define Profile/VENTANA NAME:=Gateworks Ventana family + OPTIONS:= \ + HAVE_TARGET_ROOTFS_INCLUDE_KERNEL \ + HAVE_TARGET_ROOTFS_INCLUDE_UIMAGE \ + HAVE_TARGET_ROOTFS_INCLUDE_DTB PACKAGES:= \ kmod-thermal-imx kmod-sky2 kmod-usb-chipidea kmod-usb-mxs-phy \ kmod-sound-core kmod-sound-soc-imx kmod-sound-soc-imx-sgtl5000 \ -- 2.0.3 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 10:47 AM, Luka Perkov l...@openwrt.org wrote: This patch adds support for target DEFAULT_OPTIONS and profile OPTIONS variables. Those are simmilar to existing DEFAULT_PACKAGES and PACKAGES but one can use them to select other options by default in menuconfig. I don't think this is a good idea. This is very easy to abuse (add package configuration options, build options for the kernel etc) which is unexpected, and I am not sure if this will work properly with IB. Instead of adding more cludges working around the need for individual rootfs versions/contents for devices, we should rather work on removing the need for these options. Maybe we could invert the way the rootfs is built for ubi, i.e. instead of generating the ubi, then calling Image/Build, let Image/Build/ build the individual rootfs's itself. We could have something like define Image/PrepareUbifs (copy prepared rootfs to rootfs-$(1)) (if $(3), copy contents of $() into rootfs-$(3)) (create ubifs using config $(2), calling it ubifs-$(1)) endef so a create image with dtb + zImage could look like define Image/Build/foorouter mkdir -p $(KDIR)/extra-foorouter/boot $(CP) $(KDIR)/zImage $(KDIR)/extra-foorouter/boot/zImage $(CP) $(DTS_DIR)/foorouter.dtb $(KDIR)/extra-foorouter/boot/dtb $(Call Image/PrepareUbifs,foorouter,./foorouter-ubinize.cfg, $(KDIR)/extra-foorouter)) # do the usual image preparetion steps endef define Image/Build/ubi $(call Image/Build/foorouter) endef Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 3/3] brcm-wl: use new brcm63xx fallback sprom
On Sun, Aug 10, 2014 at 6:09 PM, Álvaro Fernández Rojas
nolt...@gmail.com wrote:
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
Generally it looks good, but could use a bit more of a changelog (like
stating that you are now filling in a lot more values).
Also Rafał, could you take a look at this if this is okay?
Jonas
---
diff --git a/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch
b/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch
index 749ecbf..cf9ce63 100644
--- a/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch
+++ b/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch
@@ -6,24 +6,13 @@
+#if defined(CONFIG_SSB_PCIHOST) defined(CONFIG_BOARD_BCM963XX)
+#include linux/ssb/ssb.h
-+extern struct ssb_sprom bcm63xx_sprom;
++extern int bcm63xx_get_fallback_sprom(uint pci_bus, uint pci_slot, struct
ssb_sprom *out);
+#endif
+
#ifdef WLTEST
#include sbsprom.h
#endif /* WLTEST */
-@@ -2058,6 +2063,10 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih
- bool flash = FALSE;
- int err = 0;
-
-+#if defined(CONFIG_SSB_PCIHOST) defined(CONFIG_BOARD_BCM963XX)
-+ char eabuf[18];
-+#endif
-+
- /*
-* Apply CRC over SROM content regardless SROM is present or not,
-* and use variable devpathsromrev's existance in flash to decide
-@@ -2120,6 +2129,58 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih
+@@ -2120,6 +2125,221 @@ BCMATTACHFN(initvars_srom_pci)(si_t *sih
goto varscont;
}
@@ -32,37 +21,200 @@
+
+ if( base != NULL )
+ {
++ char eabuf[18];
++ struct ssb_sprom bcm63xx_sprom;
++ uint pci_bus = osl_pci_bus(osh), pci_slot =
osl_pci_slot(osh);
++
+ varbuf_init(b, base, MAXSZ_NVRAM_VARS);
+
-+ printk(Got version %i SPROM from SSB\n,
bcm63xx_sprom.revision);
++ bcm63xx_get_fallback_sprom(pci_bus, pci_slot,
bcm63xx_sprom);
++ printk(BCM%X(%02x:%02x) using sprom version %i\n,
sih-chip, pci_bus, pci_slot, bcm63xx_sprom.revision);
++
++ switch (bcm63xx_sprom.revision) {
++ case 8:
++ varbuf_append(b, vstr_tri2g,
bcm63xx_sprom.tri2g);
++ varbuf_append(b, vstr_tri5g,
bcm63xx_sprom.tri5g);
++ varbuf_append(b, vstr_tri5gl,
bcm63xx_sprom.tri5gl);
++ varbuf_append(b, vstr_tri5gh,
bcm63xx_sprom.tri5gh);
++
++ varbuf_append(b, vstr_rxpo2g,
bcm63xx_sprom.rxpo2g);
++ varbuf_append(b, vstr_rxpo5g,
bcm63xx_sprom.rxpo5g);
++
++ varbuf_append(b, vstr_rssismf2g,
bcm63xx_sprom.rssismf2g);
++ varbuf_append(b, vstr_rssismc2g,
bcm63xx_sprom.rssismc2g);
++ varbuf_append(b, vstr_rssisav2g,
bcm63xx_sprom.rssisav2g);
++
++ varbuf_append(b, vstr_bxa2g,
bcm63xx_sprom.bxa2g);
++ varbuf_append(b, vstr_bxa5g,
bcm63xx_sprom.bxa5g);
++
++ varbuf_append(b, vstr_rssismf5g,
bcm63xx_sprom.rssismf5g);
++ varbuf_append(b, vstr_rssismc5g,
bcm63xx_sprom.rssismc5g);
++ varbuf_append(b, vstr_rssisav5g,
bcm63xx_sprom.rssisav5g);
++
++ varbuf_append(b, vstr_cck2gpo,
bcm63xx_sprom.cck2gpo);
++
++ varbuf_append(b, vstr_ofdm2gpo,
bcm63xx_sprom.ofdm2gpo);
++ varbuf_append(b, vstr_ofdm5glpo,
bcm63xx_sprom.ofdm5glpo);
++ varbuf_append(b, vstr_ofdm5gpo,
bcm63xx_sprom.ofdm5gpo);
++ varbuf_append(b, vstr_ofdm5ghpo,
bcm63xx_sprom.ofdm5ghpo);
++
++ varbuf_append(b, vstr_itt2ga0,
bcm63xx_sprom.core_pwr_info[0].itssi_2g);
++ varbuf_append(b, vstr_itt2ga1,
bcm63xx_sprom.core_pwr_info[1].itssi_2g);
++ varbuf_append(b, vstr_maxp2ga0,
bcm63xx_sprom.core_pwr_info[0].maxpwr_2g);
++ varbuf_append(b, vstr_maxp2ga1,
bcm63xx_sprom.core_pwr_info[1].maxpwr_2g);
++
++ varbuf_append(b, vstr_pa, 2, 0, 0,
bcm63xx_sprom.core_pwr_info[0].pa_2g[0]);
++ varbuf_append(b, vstr_pa, 2, 1, 0,
bcm63xx_sprom.core_pwr_info[0].pa_2g[1]);
++ varbuf_append(b, vstr_pa, 2, 2,
Re: [OpenWrt-Devel] Moving all feeds to OpenWrt GitHub organisation
2014-08-11 1:09 GMT+03:00 Stefan Monnier monn...@iro.umontreal.ca: We use git, the day github closes, or asks for money, or ..., we move. Notice how right after suggesting github, you suggested using its bugtracker. It's only when github closes your access that you realize you didn't stick to just using Git. Stefan Why do you want GitHub to close so bad !!! If you want we can use (everyone can use) https://github.com/joeyh/github-backup (first result on google for backup github issue) (also time to check OpenWrt servers off-site backup :) ) If you really want to use OpenWrt track, some work has to be done (in the case of Trac losing history would just do the necessary clean-up faster) I really prefer taking the risk to move feeds (not the core) to GitHub, in order to risk having more contribution. Please read the Thank you! email by W. Michael Petullo ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/4] lantiq: export soc type
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
diff --git a/target/linux/lantiq/patches-3.10/0209-lantiq-export-soc-type.patch
b/target/linux/lantiq/patches-3.10/0209-lantiq-export-soc-type.patch
new file mode 100644
index 000..cb0a559
--- /dev/null
+++ b/target/linux/lantiq/patches-3.10/0209-lantiq-export-soc-type.patch
@@ -0,0 +1,25 @@
+--- a/arch/mips/include/asm/mach-lantiq/lantiq.h
b/arch/mips/include/asm/mach-lantiq/lantiq.h
+@@ -48,6 +48,8 @@ extern struct clk *clk_get_ppe(void);
+ extern unsigned char ltq_boot_select(void);
+ /* find out what caused the last cpu reset */
+ extern int ltq_reset_cause(void);
++/* find out the soc type */
++extern int ltq_soc_type(void);
+
+ #define IOPORT_RESOURCE_START 0x1000
+ #define IOPORT_RESOURCE_END 0x
+--- a/arch/mips/lantiq/prom.c
b/arch/mips/lantiq/prom.c
+@@ -35,6 +35,11 @@ const char *get_system_type(void)
+ return soc_info.sys_type;
+ }
+
++int ltq_soc_type(void)
++{
++ return soc_info.type;
++}
++
+ void prom_free_prom_memory(void)
+ {
+ }
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/4] lantiq: improve ARV7519RW22 support
- use full board name
- rename uboot-env partition
- add dsl_fw partition
- remove unneeded pinmux groups
- move gigabit ethernet to LAN
- load mac address from mtd
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index 22dea2a..2dee0c1 100644
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -156,7 +156,7 @@ TDW8970)
wan_mac=$(macaddr_add $lan_mac 1)
;;
-ARV7519*)
+ARV7519RW22)
lan_mac=$(mtd_get_mac_binary boardconfig 22)
wan_mac=$(macaddr_add $lan_mac 1)
;;
diff --git a/target/linux/lantiq/dts/ARV7519RW.dtsi
b/target/linux/lantiq/dts/ARV7519RW.dtsi
index eff337e..d2d083f 100644
--- a/target/linux/lantiq/dts/ARV7519RW.dtsi
+++ b/target/linux/lantiq/dts/ARV7519RW.dtsi
@@ -1,7 +1,7 @@
/include/ vr9.dtsi
/ {
- model = ARV7519 - Astoria Networks ARV7519RW22-A-LT;
+ model = ARV7519RW22 - Astoria Networks ARV7519RW22-A-LT;
chosen {
bootargs = console=ttyLTQ0,115200 init=/etc/preinit;
@@ -27,17 +27,22 @@
};
partition@6 {
- label = uboot_cfg;
+ label = uboot-env;
reg = 0x6 0x2;
read-only;
};
partition@8 {
label = firmware;
- reg = 0x8 0x1f0;
+ reg = 0x8 0x1e0;
};
- partition@1f8 {
+ partition@1e8 {
+ label = dsl_fw;
+ reg = 0x1e8 0x10;
+ };
+
+ boardconfig: partition@1f8 {
label = boardconfig;
reg = 0x1f8 0x8;
read-only;
@@ -54,19 +59,6 @@
lantiq,groups = mdio;
lantiq,function = mdio;
};
- gphy-leds {
- lantiq,groups = gphy0 led1, gphy1
led1;
- lantiq,function = gphy;
- lantiq,pull = 2;
- lantiq,open-drain = 0;
- lantiq,output = 1;
- };
- phy-rst {
- lantiq,pins = io42;
- lantiq,pull = 0;
- lantiq,open-drain = 0;
- lantiq,output = 1;
- };
pcie-rst {
lantiq,pins = io21;
lantiq,pull = 0;
@@ -92,8 +84,15 @@
#address-cells = 1;
#size-cells = 0;
reg = 0;
- mac-address = [ 00 11 22 33 44 55 ];
+ mtd-mac-address = boardconfig 0x16;
+ lantiq,switch;
+ ethernet@0 {
+ compatible = lantiq,xrx200-pdi-port;
+ reg = 0;
+ phy-mode = rgmii;
+ phy-handle = phy0;
+ };
ethernet@1 {
compatible = lantiq,xrx200-pdi-port;
reg = 4;
@@ -120,21 +119,6 @@
};
};
- wan: interface@1 {
- compatible = lantiq,xrx200-pdi;
- #address-cells = 1;
- #size-cells = 0;
- reg = 1;
- mac-address = [ 00 11 22 33 44 56 ];
- lantiq,wan;
- ethernet@0 {
- compatible = lantiq,xrx200-pdi-port;
- reg = 0;
- phy-mode = rgmii;
- phy-handle = phy0;
-
[OpenWrt-Devel] [PATCH 3/4] lantiq: add support for xrx200 firmware depending on soc type
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
diff --git
a/target/linux/lantiq/patches-3.10/0210-lantiq-xrx200-firmware-multi-version.patch
b/target/linux/lantiq/patches-3.10/0210-lantiq-xrx200-firmware-multi-version.patch
new file mode 100644
index 000..cf5e5cf
--- /dev/null
+++
b/target/linux/lantiq/patches-3.10/0210-lantiq-xrx200-firmware-multi-version.patch
@@ -0,0 +1,27 @@
+--- a/arch/mips/lantiq/xway/xrx200_phy_fw.c
b/arch/mips/lantiq/xway/xrx200_phy_fw.c
+@@ -24,7 +24,23 @@ static dma_addr_t xway_gphy_load(struct
+ void *fw_addr;
+ size_t size;
+
+- if (of_property_read_string(pdev-dev.of_node, firmware, fw_name)) {
++ if (of_get_property(pdev-dev.of_node, firmware1, NULL) ||
of_get_property(pdev-dev.of_node, firmware2, NULL)) {
++ switch(ltq_soc_type()) {
++ case SOC_TYPE_VR9:
++ if (of_property_read_string(pdev-dev.of_node,
firmware1, fw_name)) {
++ dev_err(pdev-dev, failed to load
firmware filename\n);
++ return 0;
++ }
++ break;
++ case SOC_TYPE_VR9_2:
++ if (of_property_read_string(pdev-dev.of_node,
firmware2, fw_name)) {
++ dev_err(pdev-dev, failed to load
firmware filename\n);
++ return 0;
++ }
++ break;
++ }
++ }
++ else if (of_property_read_string(pdev-dev.of_node, firmware,
fw_name)) {
+ dev_err(pdev-dev, failed to load firmware filename\n);
+ return 0;
+ }
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 4/4] lantiq: generate unique ARV7519RW22 firmware
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
diff --git a/target/linux/lantiq/dts/ARV7519RW.dtsi
b/target/linux/lantiq/dts/ARV7519RW.dtsi
deleted file mode 100644
index d2d083f..000
--- a/target/linux/lantiq/dts/ARV7519RW.dtsi
+++ /dev/null
@@ -1,222 +0,0 @@
-/include/ vr9.dtsi
-
-/ {
- model = ARV7519RW22 - Astoria Networks ARV7519RW22-A-LT;
-
- chosen {
- bootargs = console=ttyLTQ0,115200 init=/etc/preinit;
- };
-
- memory@0 {
- reg = 0x0 0x800;
- };
-
- fpi@1000 {
- localbus@0 {
- nor-boot@0 {
- compatible = lantiq,nor;
- bank-width = 2;
- reg = 0 0x0 0x200, 1 0x200
0x200;
- #address-cells = 1;
- #size-cells = 1;
-
- partition@0 {
- label = uboot;
- reg = 0x0 0x6;
- read-only;
- };
-
- partition@6 {
- label = uboot-env;
- reg = 0x6 0x2;
- read-only;
- };
-
- partition@8 {
- label = firmware;
- reg = 0x8 0x1e0;
- };
-
- partition@1e8 {
- label = dsl_fw;
- reg = 0x1e8 0x10;
- };
-
- boardconfig: partition@1f8 {
- label = boardconfig;
- reg = 0x1f8 0x8;
- read-only;
- };
- };
- };
-
- gpio: pinmux@E100B10 {
- pinctrl-names = default;
- pinctrl-0 = state_default;
-
- state_default: pinmux {
- mdio {
- lantiq,groups = mdio;
- lantiq,function = mdio;
- };
- pcie-rst {
- lantiq,pins = io21;
- lantiq,pull = 0;
- lantiq,output = 1;
- };
- };
- };
-
- eth@E108000 {
- #address-cells = 1;
- #size-cells = 0;
- compatible = lantiq,xrx200-net;
- reg = 0xE108000 0x3000 /* switch */
- 0xE10B100 0x70 /* mdio */
- 0xE10B1D8 0x30 /* mii */
- 0xE10B308 0x30 /* pmac */
- ;
- interrupt-parent = icu0;
- interrupts = 73 72;
-
- lan: interface@0 {
- compatible = lantiq,xrx200-pdi;
- #address-cells = 1;
- #size-cells = 0;
- reg = 0;
- mtd-mac-address = boardconfig 0x16;
- lantiq,switch;
-
- ethernet@0 {
- compatible = lantiq,xrx200-pdi-port;
- reg = 0;
- phy-mode = rgmii;
- phy-handle = phy0;
- };
- ethernet@1 {
- compatible = lantiq,xrx200-pdi-port;
- reg = 4;
- phy-mode = mii;
- phy-handle = phy13;
- };
- ethernet@2 {
- compatible = lantiq,xrx200-pdi-port;
- reg = 5;
- phy-mode = mii;
- phy-handle = phy14;
- };
- ethernet@3 {
- compatible = lantiq,xrx200-pdi-port;
- reg = 2;
- phy-mode = mii;
- phy-handle
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 01:17:04PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 10:47 AM, Luka Perkov l...@openwrt.org wrote: This patch adds support for target DEFAULT_OPTIONS and profile OPTIONS variables. Those are simmilar to existing DEFAULT_PACKAGES and PACKAGES but one can use them to select other options by default in menuconfig. I don't think this is a good idea. This is very easy to abuse (add package configuration options, build options for the kernel etc) which is unexpected, and I am not sure if this will work properly with IB. Why do you think this would not work properly with IB? Instead of adding more cludges working around the need for individual rootfs versions/contents for devices, we should rather work on removing the need for these options. Even though this now is useful mainly for including kernel/dtb in rootfs we could also use it for other options as well. For example on not resource constraint platforms we could add support for kexec, cgroups, namespaces and others if we wanted without hackery in config/ directory. Luka Maybe we could invert the way the rootfs is built for ubi, i.e. instead of generating the ubi, then calling Image/Build, let Image/Build/ build the individual rootfs's itself. We could have something like define Image/PrepareUbifs (copy prepared rootfs to rootfs-$(1)) (if $(3), copy contents of $() into rootfs-$(3)) (create ubifs using config $(2), calling it ubifs-$(1)) endef so a create image with dtb + zImage could look like define Image/Build/foorouter mkdir -p $(KDIR)/extra-foorouter/boot $(CP) $(KDIR)/zImage $(KDIR)/extra-foorouter/boot/zImage $(CP) $(DTS_DIR)/foorouter.dtb $(KDIR)/extra-foorouter/boot/dtb $(Call Image/PrepareUbifs,foorouter,./foorouter-ubinize.cfg, $(KDIR)/extra-foorouter)) # do the usual image preparetion steps endef define Image/Build/ubi $(call Image/Build/foorouter) endef Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] brcm63xx: fix HG556a boards and remove fallback board
This changes board info to match the Wiki
http://wiki.openwrt.org/toh/huawei/hg556a and removes the no longer needed
fallback board.
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
diff --git
a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 8e229d1..2d8f1f5 100644
--- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -31,7 +31,7 @@ board=$board_name
case $FIRMWARE in
rt2x00.eeprom )
case $board in
- HW556_A)
+ HW556_C)
rt2x00_eeprom_extract cal_data 130560 512
;;
*)
diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
index 2013b7d..72860d9 100644
--- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
@@ -8,100 +8,10 @@
#include linux/platform_device.h
#include linux/spi/spi.h
#include linux/spi/spi_gpio.h
-@@ -2667,6 +2668,495 @@ static struct board_info __initdata boar
+@@ -2667,6 +2668,405 @@ static struct board_info __initdata boar
},
};
-+static struct board_info __initdata board_HW556 = {
-+ .name = HW556,
-+ .expected_cpu_id= 0x6358,
-+
-+ .has_uart0 = 1,
-+ .has_pci= 1,
-+ .has_ohci0 = 1,
-+ .has_ehci0 = 1,
-+ .num_usbh_ports = 2,
-+
-+ .has_caldata= 1,
-+ .caldata = {
-+ {
-+ .caldata_offset = 0xe0,
-+ },
-+ },
-+
-+ .has_enet1 = 1,
-+ .enet1 = {
-+ .has_phy= 1,
-+ .phy_id = 0,
-+ .force_speed_100= 1,
-+ .force_duplex_full = 1,
-+ },
-+
-+ .leds = {
-+ {
-+ .name = HW556:red:message,
-+ .gpio = 0,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:hspa,
-+ .gpio = 1,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:dsl,
-+ .gpio = 2,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:power,
-+ .gpio = 3,
-+ .active_low = 1,
-+ .default_trigger= default-on,
-+ },
-+ {
-+ .name = HW556:red:all,
-+ .gpio = 6,
-+ .active_low = 1,
-+ .default_trigger= default-on,
-+ },
-+ },
-+
-+ .buttons = {
-+ {
-+ .desc = help,
-+ .gpio = 8,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_HELP,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = wlan,
-+ .gpio = 9,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_WLAN,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = restart,
-+ .gpio = 10,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = reset,
-+ .gpio = 11,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_CONFIG,
-+
[OpenWrt-Devel] [PATCH 2/2] brcm63xx: simplify HG556a image generation
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com --- diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index b445dcb..8c8d81b 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -210,15 +210,6 @@ define CfeImageDTB TARGET_IMAGES += $(4) endef -define HW556ImageDTB - define Image/Build/$(2) - $$(call Image/Build/CFEDTB,$$(1),$(1),HW556,6358,$(2),EchoLife_HG556a,--image-offset 0x2 --block-size 0x2 --tag-version 8) - endef - - TARGET_DTBS += $(1) - TARGET_IMAGES += $(2) -endef - define Image/Build dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync @@ -371,10 +362,10 @@ $(eval $(call CfeImageDTB,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) $(eval $(call CfeImageDTB,dsl-274xb-c,AW4139,6358,DSL274XB-C3)) # D-Link DVA-G3810BN/TL $(eval $(call CfeImageDTB,dva-g3810bn_tl,96358VW,6358,DVAG3810BN)) -# Huawei HW556 -$(eval $(call HW556ImageDTB,hg556a-a,HW556-A)) -$(eval $(call HW556ImageDTB,hg556a-b,HW556-B)) -$(eval $(call HW556ImageDTB,hg556a-c,HW556-C)) +# Huawei HG556a +$(eval $(call CfeImageDTB,hg556a-a,HW556,6358,HG556a_A,EchoLife_HG556a,--image-offset 0x2 --block-size 0x1 --tag-version 8)) +$(eval $(call CfeImageDTB,hg556a-b,HW556,6358,HG556a_B,EchoLife_HG556a,--image-offset 0x2 --block-size 0x2 --tag-version 8)) +$(eval $(call CfeImageDTB,hg556a-c,HW556,6358,HG556a_C,EchoLife_HG556a,--image-offset 0x2 --block-size 0x2 --tag-version 8)) # SFR Neufbox 4 $(eval $(call CfeImageDTB,nb4-ser-r0,96358VW,6358,NEUFBOX4-SER,OpenWRT-$(REVISION))) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH V2 1/2] brcm63xx: fix HG556a boards and remove fallback board
This changes board info to match the Wiki
http://wiki.openwrt.org/toh/huawei/hg556a, removes the no longer needed
fallback board and fixes HG556 Ralink eeprom extraction.
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
diff --git
a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 8e229d1..049da77 100644
--- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -31,8 +31,8 @@ board=$board_name
case $FIRMWARE in
rt2x00.eeprom )
case $board in
- HW556_A)
- rt2x00_eeprom_extract cal_data 130560 512
+ HW556_C)
+ rt2x00_eeprom_extract caldata 130560 512
;;
*)
rt2x00_eeprom_die board $board is not supported yet
diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
index 2013b7d..72860d9 100644
--- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
@@ -8,100 +8,10 @@
#include linux/platform_device.h
#include linux/spi/spi.h
#include linux/spi/spi_gpio.h
-@@ -2667,6 +2668,495 @@ static struct board_info __initdata boar
+@@ -2667,6 +2668,405 @@ static struct board_info __initdata boar
},
};
-+static struct board_info __initdata board_HW556 = {
-+ .name = HW556,
-+ .expected_cpu_id= 0x6358,
-+
-+ .has_uart0 = 1,
-+ .has_pci= 1,
-+ .has_ohci0 = 1,
-+ .has_ehci0 = 1,
-+ .num_usbh_ports = 2,
-+
-+ .has_caldata= 1,
-+ .caldata = {
-+ {
-+ .caldata_offset = 0xe0,
-+ },
-+ },
-+
-+ .has_enet1 = 1,
-+ .enet1 = {
-+ .has_phy= 1,
-+ .phy_id = 0,
-+ .force_speed_100= 1,
-+ .force_duplex_full = 1,
-+ },
-+
-+ .leds = {
-+ {
-+ .name = HW556:red:message,
-+ .gpio = 0,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:hspa,
-+ .gpio = 1,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:dsl,
-+ .gpio = 2,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:power,
-+ .gpio = 3,
-+ .active_low = 1,
-+ .default_trigger= default-on,
-+ },
-+ {
-+ .name = HW556:red:all,
-+ .gpio = 6,
-+ .active_low = 1,
-+ .default_trigger= default-on,
-+ },
-+ },
-+
-+ .buttons = {
-+ {
-+ .desc = help,
-+ .gpio = 8,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_HELP,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = wlan,
-+ .gpio = 9,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_WLAN,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = restart,
-+ .gpio = 10,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = reset,
-+ .gpio = 11,
-+ .active_low
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 2:57 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 01:17:04PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 10:47 AM, Luka Perkov l...@openwrt.org wrote: This patch adds support for target DEFAULT_OPTIONS and profile OPTIONS variables. Those are simmilar to existing DEFAULT_PACKAGES and PACKAGES but one can use them to select other options by default in menuconfig. I don't think this is a good idea. This is very easy to abuse (add package configuration options, build options for the kernel etc) which is unexpected, and I am not sure if this will work properly with IB. Why do you think this would not work properly with IB? Instead of adding more cludges working around the need for individual rootfs versions/contents for devices, we should rather work on removing the need for these options. Even though this now is useful mainly for including kernel/dtb in rootfs we could also use it for other options as well. For example on not resource constraint platforms we could add support for kexec, cgroups, namespaces and others if we wanted without hackery in config/ directory. cgroups and kexec are exactly what I'm talking about what won't work with the IB. Say you create an IB (with the default profile selected). Now if you run make PROFILE=foo, where foo selects cgroups or kexec, the resulting kernel won't actually have this enabled as this would require a recompilation of the kernel, which isn't possible in IB. And when building from source, you also can't build a release-compatible image when selecting a profile selecting cgroups/kexec, as the kernel's hash will not match the releases's config, unless the default profile also does that. So in effect if we do that we need to build a separate packages feed and a separate SDK and IB for each of the profiles. I don't think this is feasable. And further, in your approach you directly select the options, not just change the defaults (in contrast to the default packages), so you can't even deselect them anymore. Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH V3 1/2] brcm63xx: fix HG556a boards and remove fallback board
This changes board info to match the Wiki
http://wiki.openwrt.org/toh/huawei/hg556a, removes the no longer needed
fallback board and fixes HG556 Ralink eeprom extraction.
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
v2: rename caldata partition
v3: rename the board IDs instead of moving the caldata info
diff --git
a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 8e229d1..049da77 100644
--- a/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/brcm63xx/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -31,8 +31,8 @@ board=$board_name
case $FIRMWARE in
rt2x00.eeprom )
case $board in
- HW556_A)
- rt2x00_eeprom_extract cal_data 130560 512
+ HW556_C)
+ rt2x00_eeprom_extract caldata 130560 512
;;
*)
rt2x00_eeprom_die board $board is not supported yet
diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
index 2013b7d..c1af61b 100644
--- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
@@ -8,103 +8,13 @@
#include linux/platform_device.h
#include linux/spi/spi.h
#include linux/spi/spi_gpio.h
-@@ -2667,6 +2668,495 @@ static struct board_info __initdata boar
+@@ -2667,6 +2668,405 @@ static struct board_info __initdata boar
},
};
-+static struct board_info __initdata board_HW556 = {
-+ .name = HW556,
-+ .expected_cpu_id= 0x6358,
-+
-+ .has_uart0 = 1,
-+ .has_pci= 1,
-+ .has_ohci0 = 1,
-+ .has_ehci0 = 1,
-+ .num_usbh_ports = 2,
-+
-+ .has_caldata= 1,
-+ .caldata = {
-+ {
-+ .caldata_offset = 0xe0,
-+ },
-+ },
-+
-+ .has_enet1 = 1,
-+ .enet1 = {
-+ .has_phy= 1,
-+ .phy_id = 0,
-+ .force_speed_100= 1,
-+ .force_duplex_full = 1,
-+ },
-+
-+ .leds = {
-+ {
-+ .name = HW556:red:message,
-+ .gpio = 0,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:hspa,
-+ .gpio = 1,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:dsl,
-+ .gpio = 2,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = HW556:red:power,
-+ .gpio = 3,
-+ .active_low = 1,
-+ .default_trigger= default-on,
-+ },
-+ {
-+ .name = HW556:red:all,
-+ .gpio = 6,
-+ .active_low = 1,
-+ .default_trigger= default-on,
-+ },
-+ },
-+
-+ .buttons = {
-+ {
-+ .desc = help,
-+ .gpio = 8,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_HELP,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = wlan,
-+ .gpio = 9,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_WLAN,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = restart,
-+ .gpio = 10,
-+ .active_low = 1,
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval =
BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+ },
-+ {
-+ .desc = reset,
[OpenWrt-Devel] [PATCH] dragino2 update GPIO definitions
Update mach-dragino2.c from Dragino2 official repository.
The patch should directly apply in trunk.
--
./p4u
From 31692b700b79499bf0510b5350253b4c619c49ba Mon Sep 17 00:00:00 2001
From: Pau Escrich p...@dabax.net
Date: Mon, 11 Aug 2014 15:57:37 +0200
Subject: [PATCH] Update dragino2 GPIO definitions
Signed-off-by: Pau Escrich p...@dabax.net
---
.../ar71xx/files/arch/mips/ath79/mach-dragino2.c | 105 +++--
1 file changed, 99 insertions(+), 6 deletions(-)
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
index 156fbe5..f6e0fd7 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
@@ -2,7 +2,7 @@
* DRAGINO V2 board support, based on Atheros AP121 board support
*
* Copyright (C) 2011-2012 Gabor Juhos juh...@openwrt.org
- * Copyright (C) 2012 Elektra Wagenrad elek...@villagetelco.org
+ * Copyright (C) 2012-2013 Elektra Wagenrad elek...@villagetelco.org
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
@@ -21,13 +21,29 @@
#include dev-usb.h
#include dev-wmac.h
#include machtypes.h
+// Added for SPI bitbanging support
+#include linux/spi/spi_gpio.h
+#include linux/irq.h
+#include linux/interrupt.h
+#include linux/kernel.h
+#include linux/init.h
+#include linux/linkage.h
+#include linux/platform_device.h
+#include linux/types.h
+#include linux/leds.h
+#include linux/spi/spi.h
+#include linux/spi/spidev.h
+#include linux/spi/spi_bitbang.h
+#include linux/gpio.h
+
+
#define DRAGINO2_GPIO_LED_WLAN 0
#define DRAGINO2_GPIO_LED_LAN 13
#define DRAGINO2_GPIO_LED_WAN 17
-/*
- * The following GPIO is actually named Router on the board.
+
+/* The following GPIO is actually named Router on the board.
* However, since the Router feature is not supported as of yet
* we use it to display USB activity.
*/
@@ -44,6 +60,8 @@
#define DRAGINO2_CALDATA_OFFSET 0x1000
#define DRAGINO2_WMAC_MAC_OFFSET 0x1002
+
+
static struct gpio_led dragino2_leds_gpio[] __initdata = {
{
.name = dragino2:red:lan,
@@ -65,6 +83,8 @@ static struct gpio_led dragino2_leds_gpio[] __initdata = {
.gpio = DRAGINO2_GPIO_LED_USB,
.active_low = 0,
},
+
+
};
static struct gpio_keys_button dragino2_gpio_keys[] __initdata = {
@@ -86,9 +106,61 @@ static struct gpio_keys_button dragino2_gpio_keys[] __initdata = {
}
};
+/* Support for a second SPI Master with ID-number 1
+ * by bitbanging GPIOs
+ *
+ * GPIO resources used by for the Si3217x-based FXS SPI slave module:
+ *
+ * CS (Chip select) for FXS board, SPI slave device #0, selected by GPIO_24 @Router_header_PIN12
+ * FXS_RESET = GPIO 23 @Router_header_PIN9
+ * FXS_INT = GPIO27 = @JTAG_header_PIN2
+ * SCLK = GPIO_15 = @JTAG_header_PIN9
+ * MOSI = GPIO_16 = @JTAG_header_PIN10
+ * MISO = GPIO_26 = @JTAG_header_PIN1
+*/
+
+
+static struct spi_gpio_platform_data dragino2_20_spi_gpio_data = {
+.sck = 15,
+.mosi = 16,
+.miso = 26,
+.num_chipselect = 1
+};
+
+static struct platform_device dragino2_spi_gpio_device = {
+.name = spi_gpio,
+.id = 1,
+.dev.platform_data = dragino2_20_spi_gpio_data,
+};
+
+
+
+// WiP: Add SPI client support for the FXS module
+
+/*static struct si3217x_platform_data si3217x_info [] = {
+ {
+ .reset = 23,
+ },
+};*/
+
+static struct spi_board_info si3217x_spi_info[] = {
+ {
+ .bus_num = 1,
+ .max_speed_hz = 1000,
+ .modalias = si3217x,
+ .chip_select = 0,
+ .controller_data= (void *) 24,
+ .mode = 3,
+ .irq = 27,
+ }
+};
+
+
+
static void __init dragino2_common_setup(void)
{
u8 *art = (u8 *) KSEG1ADDR(0x1fff);
+ u32 val;
ath79_register_m25p80(NULL);
ath79_register_wmac(art + DRAGINO2_CALDATA_OFFSET,
@@ -99,19 +171,35 @@ static void __init dragino2_common_setup(void)
ath79_register_mdio(0, 0x0);
- /* Enable GPIO15 and GPIO16 and possibly GPIO26 and GPIO27 */
- ath79_gpio_function_disable(AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
-AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN);
+ //Enable GPIO15 and GPIO16
+ ath79_gpio_function_disable(
+ AR933X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+ AR933X_GPIO_FUNC_ETH_SWITCH_LED3_EN
+ );
/* LAN ports */
ath79_register_eth(1);
/* WAN port */
ath79_register_eth(0);
+
+
+ /* Enable GPIO26 and GPIO27 */
+ /* Read reset register */
+ val = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
+
+ val |= AR933X_BOOTSTRAP_MDIO_GPIO_EN;
+
+ /* Write reset register */
+ ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP, val);
}
+
+
static void __init dragino2_setup(void)
{
+ printk(KERN_INFO In dragino2_setup()\n);
+
dragino2_common_setup();
ath79_register_leds_gpio(-1, ARRAY_SIZE(dragino2_leds_gpio),
@@ -120,8 +208,13 @@ static void __init dragino2_setup(void)
ARRAY_SIZE(dragino2_gpio_keys),
dragino2_gpio_keys);
Re: [OpenWrt-Devel] [PATCH] dragino2 update GPIO definitions
Please no. This might match your combination of dragino2 mainboard plus your
daughterboard, but
it most certainly doesn't match everyone's. Also it contains lots of
gratuitous whitespace
changes. Possibly it might be time to make more than one dragino2 config,
and possibly it
should just start using the names on the PCB, MS14, for instance. (Ours are
version 2.3)
Really, most of the changes in the dragino github repo since they moved from
svn have been a
pile of custom blobs for various projects, and not at all the nice clean
machine level changes
that the bare board should have.
Sincerely,
Karl Palsson
On Mon, Aug 11, 2014 at 04:04:08PM +0200, Pau wrote:
Update mach-dragino2.c from Dragino2 official repository.
The patch should directly apply in trunk.
--
./p4u
From 31692b700b79499bf0510b5350253b4c619c49ba Mon Sep 17 00:00:00 2001
From: Pau Escrich p...@dabax.net
Date: Mon, 11 Aug 2014 15:57:37 +0200
Subject: [PATCH] Update dragino2 GPIO definitions
Signed-off-by: Pau Escrich p...@dabax.net
---
.../ar71xx/files/arch/mips/ath79/mach-dragino2.c | 105
+++--
1 file changed, 99 insertions(+), 6 deletions(-)
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
index 156fbe5..f6e0fd7 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
@@ -2,7 +2,7 @@
* DRAGINO V2 board support, based on Atheros AP121 board support
*
* Copyright (C) 2011-2012 Gabor Juhos juh...@openwrt.org
- * Copyright (C) 2012 Elektra Wagenrad elek...@villagetelco.org
+ * Copyright (C) 2012-2013 Elektra Wagenrad elek...@villagetelco.org
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
@@ -21,13 +21,29 @@
#include dev-usb.h
#include dev-wmac.h
#include machtypes.h
+// Added for SPI bitbanging support
+#include linux/spi/spi_gpio.h
+#include linux/irq.h
+#include linux/interrupt.h
+#include linux/kernel.h
+#include linux/init.h
+#include linux/linkage.h
+#include linux/platform_device.h
+#include linux/types.h
+#include linux/leds.h
+#include linux/spi/spi.h
+#include linux/spi/spidev.h
+#include linux/spi/spi_bitbang.h
+#include linux/gpio.h
+
+
#define DRAGINO2_GPIO_LED_WLAN 0
#define DRAGINO2_GPIO_LED_LAN13
#define DRAGINO2_GPIO_LED_WAN17
-/*
- * The following GPIO is actually named Router on the board.
+
+/* The following GPIO is actually named Router on the board.
* However, since the Router feature is not supported as of yet
* we use it to display USB activity.
*/
@@ -44,6 +60,8 @@
#define DRAGINO2_CALDATA_OFFSET 0x1000
#define DRAGINO2_WMAC_MAC_OFFSET 0x1002
+
+
static struct gpio_led dragino2_leds_gpio[] __initdata = {
{
.name = dragino2:red:lan,
@@ -65,6 +83,8 @@ static struct gpio_led dragino2_leds_gpio[] __initdata = {
.gpio = DRAGINO2_GPIO_LED_USB,
.active_low = 0,
},
+
+
};
static struct gpio_keys_button dragino2_gpio_keys[] __initdata = {
@@ -86,9 +106,61 @@ static struct gpio_keys_button dragino2_gpio_keys[]
__initdata = {
}
};
+/* Support for a second SPI Master with ID-number 1
+ * by bitbanging GPIOs
+ *
+ * GPIO resources used by for the Si3217x-based FXS SPI slave module:
+ *
+ * CS (Chip select) for FXS board, SPI slave device #0, selected by GPIO_24
@Router_header_PIN12
+ * FXS_RESET = GPIO 23 @Router_header_PIN9
+ * FXS_INT = GPIO27 = @JTAG_header_PIN2
+ * SCLK = GPIO_15 = @JTAG_header_PIN9
+ * MOSI = GPIO_16 = @JTAG_header_PIN10
+ * MISO = GPIO_26 = @JTAG_header_PIN1
+*/
+
+
+static struct spi_gpio_platform_data dragino2_20_spi_gpio_data = {
+.sck = 15,
+.mosi = 16,
+.miso = 26,
+.num_chipselect = 1
+};
+
+static struct platform_device dragino2_spi_gpio_device = {
+.name= spi_gpio,
+.id = 1,
+.dev.platform_data = dragino2_20_spi_gpio_data,
+};
+
+
+
+// WiP: Add SPI client support for the FXS module
+
+/*static struct si3217x_platform_data si3217x_info [] = {
+ {
+ .reset = 23,
+ },
+};*/
+
+static struct spi_board_info si3217x_spi_info[] = {
+ {
+ .bus_num= 1,
+ .max_speed_hz = 1000,
+ .modalias = si3217x,
+ .chip_select= 0,
+ .controller_data= (void *) 24,
+ .mode = 3,
+ .irq= 27,
+ }
+};
+
+
+
static void __init dragino2_common_setup(void)
{
u8 *art = (u8 *) KSEG1ADDR(0x1fff);
+ u32 val;
ath79_register_m25p80(NULL);
ath79_register_wmac(art +
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 03:21:58PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 2:57 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 01:17:04PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 10:47 AM, Luka Perkov l...@openwrt.org wrote: This patch adds support for target DEFAULT_OPTIONS and profile OPTIONS variables. Those are simmilar to existing DEFAULT_PACKAGES and PACKAGES but one can use them to select other options by default in menuconfig. I don't think this is a good idea. This is very easy to abuse (add package configuration options, build options for the kernel etc) which is unexpected, and I am not sure if this will work properly with IB. Why do you think this would not work properly with IB? Instead of adding more cludges working around the need for individual rootfs versions/contents for devices, we should rather work on removing the need for these options. Even though this now is useful mainly for including kernel/dtb in rootfs we could also use it for other options as well. For example on not resource constraint platforms we could add support for kexec, cgroups, namespaces and others if we wanted without hackery in config/ directory. cgroups and kexec are exactly what I'm talking about what won't work with the IB. Say you create an IB (with the default profile selected). Now if you run make PROFILE=foo, where foo selects cgroups or kexec, the resulting kernel won't actually have this enabled as this would require a recompilation of the kernel, which isn't possible in IB. Ok. Those specific options can be limited to target, not profile. I don't see this as a problem. And when building from source, you also can't build a release-compatible image when selecting a profile selecting cgroups/kexec, as the kernel's hash will not match the releases's config, unless the default profile also does that. So in effect if we do that we need to build a separate packages feed and a separate SDK and IB for each of the profiles. I don't think this is feasable. Same comment as above. Those options which would require kernel re-build can be set globally on target if maintainer wants to. And further, in your approach you directly select the options, not just change the defaults (in contrast to the default packages), so you can't even deselect them anymore. You can deselect options with this series. That was the goal and that is why there are HAVE_* options present. Give it a try. Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 5:06 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 03:21:58PM +0200, Jonas Gorski wrote: And further, in your approach you directly select the options, not just change the defaults (in contrast to the default packages), so you can't even deselect them anymore. You can deselect options with this series. That was the goal and that is why there are HAVE_* options present. Give it a try. So what is the difference to FEATURES:= then? These already select different HAVE_FOO things. Can't you just add the missing features there? Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] dragino2 update GPIO definitions
The one I got is the meshpotato v2, so I don't know about other kind of
dragino boards. However what you say makes sense, let's just ignore
this patch.
And sure, it would be nice to have some specific targets or subtargets
for the different flavors of this board.
Cheers.
El lun 11 ago 2014 16:36:44 CEST, Karl Palsson escribió:
Please no. This might match your combination of dragino2 mainboard plus your
daughterboard, but
it most certainly doesn't match everyone's. Also it contains lots of
gratuitous whitespace
changes. Possibly it might be time to make more than one dragino2 config,
and possibly it
should just start using the names on the PCB, MS14, for instance. (Ours are
version 2.3)
Really, most of the changes in the dragino github repo since they moved from
svn have been a
pile of custom blobs for various projects, and not at all the nice clean
machine level changes
that the bare board should have.
Sincerely,
Karl Palsson
On Mon, Aug 11, 2014 at 04:04:08PM +0200, Pau wrote:
Update mach-dragino2.c from Dragino2 official repository.
The patch should directly apply in trunk.
--
./p4u
From 31692b700b79499bf0510b5350253b4c619c49ba Mon Sep 17 00:00:00 2001
From: Pau Escrich p...@dabax.net
Date: Mon, 11 Aug 2014 15:57:37 +0200
Subject: [PATCH] Update dragino2 GPIO definitions
Signed-off-by: Pau Escrich p...@dabax.net
---
.../ar71xx/files/arch/mips/ath79/mach-dragino2.c | 105
+++--
1 file changed, 99 insertions(+), 6 deletions(-)
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
index 156fbe5..f6e0fd7 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dragino2.c
@@ -2,7 +2,7 @@
* DRAGINO V2 board support, based on Atheros AP121 board support
*
* Copyright (C) 2011-2012 Gabor Juhos juh...@openwrt.org
- * Copyright (C) 2012 Elektra Wagenrad elek...@villagetelco.org
+ * Copyright (C) 2012-2013 Elektra Wagenrad elek...@villagetelco.org
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published
@@ -21,13 +21,29 @@
#include dev-usb.h
#include dev-wmac.h
#include machtypes.h
+// Added for SPI bitbanging support
+#include linux/spi/spi_gpio.h
+#include linux/irq.h
+#include linux/interrupt.h
+#include linux/kernel.h
+#include linux/init.h
+#include linux/linkage.h
+#include linux/platform_device.h
+#include linux/types.h
+#include linux/leds.h
+#include linux/spi/spi.h
+#include linux/spi/spidev.h
+#include linux/spi/spi_bitbang.h
+#include linux/gpio.h
+
+
#define DRAGINO2_GPIO_LED_WLAN 0
#define DRAGINO2_GPIO_LED_LAN 13
#define DRAGINO2_GPIO_LED_WAN 17
-/*
- * The following GPIO is actually named Router on the board.
+
+/* The following GPIO is actually named Router on the board.
* However, since the Router feature is not supported as of yet
* we use it to display USB activity.
*/
@@ -44,6 +60,8 @@
#define DRAGINO2_CALDATA_OFFSET 0x1000
#define DRAGINO2_WMAC_MAC_OFFSET0x1002
+
+
static struct gpio_led dragino2_leds_gpio[] __initdata = {
{
.name = dragino2:red:lan,
@@ -65,6 +83,8 @@ static struct gpio_led dragino2_leds_gpio[] __initdata = {
.gpio = DRAGINO2_GPIO_LED_USB,
.active_low = 0,
},
+
+
};
static struct gpio_keys_button dragino2_gpio_keys[] __initdata = {
@@ -86,9 +106,61 @@ static struct gpio_keys_button dragino2_gpio_keys[]
__initdata = {
}
};
+/* Support for a second SPI Master with ID-number 1
+ * by bitbanging GPIOs
+ *
+ * GPIO resources used by for the Si3217x-based FXS SPI slave module:
+ *
+ * CS (Chip select) for FXS board, SPI slave device #0, selected by GPIO_24
@Router_header_PIN12
+ * FXS_RESET = GPIO 23 @Router_header_PIN9
+ * FXS_INT = GPIO27 = @JTAG_header_PIN2
+ * SCLK = GPIO_15 = @JTAG_header_PIN9
+ * MOSI = GPIO_16 = @JTAG_header_PIN10
+ * MISO = GPIO_26 = @JTAG_header_PIN1
+*/
+
+
+static struct spi_gpio_platform_data dragino2_20_spi_gpio_data = {
+.sck = 15,
+.mosi = 16,
+.miso = 26,
+.num_chipselect = 1
+};
+
+static struct platform_device dragino2_spi_gpio_device = {
+.name = spi_gpio,
+.id = 1,
+.dev.platform_data = dragino2_20_spi_gpio_data,
+};
+
+
+
+// WiP: Add SPI client support for the FXS module
+
+/*static struct si3217x_platform_data si3217x_info [] = {
+{
+ .reset = 23,
+},
+};*/
+
+static struct spi_board_info si3217x_spi_info[] = {
+{
+.bus_num= 1,
+.max_speed_hz = 1000,
+.modalias = si3217x,
+.chip_select= 0,
+.controller_data=
[OpenWrt-Devel] Trac suggestions
Hi everybody, I've already sent these ideas in other emails/on irc but i haven't got answers. It would be great if one of the Trac admin could: -add more people with write access, like packages maintainers, because there is a lot of cleanup/triage to do -disable anonymous posting, except spam i don't see the use case -allow author of a ticket to close it (don't know if it's possible) BTW my login is etienne.champetier on Trac Thanks in advance Etienne ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 05:24:32PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 5:06 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 03:21:58PM +0200, Jonas Gorski wrote: And further, in your approach you directly select the options, not just change the defaults (in contrast to the default packages), so you can't even deselect them anymore. You can deselect options with this series. That was the goal and that is why there are HAVE_* options present. Give it a try. So what is the difference to FEATURES:= then? These already select different HAVE_FOO things. Can't you just add the missing features there? FEATURES nor DEPENDS are not good candidates for this. They are global for target/subtarget. So you can not define in same target/subtarget for one profile to include only zImage and for other to include only uImage. You can see that does not work if you look how Freescale i.MX23/i.MX28 (mxs) now behaves. Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 6:34 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 05:24:32PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 5:06 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 03:21:58PM +0200, Jonas Gorski wrote: And further, in your approach you directly select the options, not just change the defaults (in contrast to the default packages), so you can't even deselect them anymore. You can deselect options with this series. That was the goal and that is why there are HAVE_* options present. Give it a try. So what is the difference to FEATURES:= then? These already select different HAVE_FOO things. Can't you just add the missing features there? FEATURES nor DEPENDS are not good candidates for this. They are global for target/subtarget. So you can not define in same target/subtarget for one profile to include only zImage and for other to include only uImage. You can see that does not work if you look how Freescale i.MX23/i.MX28 (mxs) now behaves. So the clean solution is to make them both work at the same time, not to add additional workarounds. Correct image generation should not depend on profile selection. All these options currently alter the way the single (ubi) rootfs is generated, while they should enable different rootfs variants to be generated at the same time. This is the root issue, and this is where it should be fixed. Yes, it isn't easy to fix, but we should not break it further. Jonas ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/4] lantiq: export soc type
On 08/11/2014 04:59 AM, Álvaro Fernández Rojas wrote:
Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com
---
diff --git
a/target/linux/lantiq/patches-3.10/0209-lantiq-export-soc-type.patch
b/target/linux/lantiq/patches-3.10/0209-lantiq-export-soc-type.patch
new file mode 100644
index 000..cb0a559
--- /dev/null
+++ b/target/linux/lantiq/patches-3.10/0209-lantiq-export-soc-type.patch
@@ -0,0 +1,25 @@
+--- a/arch/mips/include/asm/mach-lantiq/lantiq.h
b/arch/mips/include/asm/mach-lantiq/lantiq.h
+@@ -48,6 +48,8 @@ extern struct clk *clk_get_ppe(void);
+ extern unsigned char ltq_boot_select(void);
+ /* find out what caused the last cpu reset */
+ extern int ltq_reset_cause(void);
++/* find out the soc type */
++extern int ltq_soc_type(void);
+
+ #define IOPORT_RESOURCE_START 0x1000
+ #define IOPORT_RESOURCE_END 0x
+--- a/arch/mips/lantiq/prom.c
b/arch/mips/lantiq/prom.c
+@@ -35,6 +35,11 @@ const char *get_system_type(void)
+ return soc_info.sys_type;
+ }
+
++int ltq_soc_type(void)
++{
++return soc_info.type;
++}
You might want to have an EXPORT_SYMBOL() for this function such that it
can be used in modules too.
++
+ void prom_free_prom_memory(void)
+ {
+ }
___
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] [ANN] MicroPython - well-known scripting language, unbloated
Hello Nicolás, Sorry for the delay with response - vacation time. On Wed, 23 Jul 2014 14:30:55 -0300 Nicolás Echániz nicoecha...@altermundi.net wrote: On 07/14/2014 06:30 PM, Paul Sokolovsky wrote: I don't want to have a long thread here discussing non-technical sides of MicroPython (that's surely an offtopic), just hope that answers above clarify that there's some paradigm behind the project. One thing is clear - if more people won't use it, and contribute to it, it won't make it. I hope that MicroPython may be of interest (at least in FYI sense) to OpenWRT users/developers, that's why I posted about it, and if someone will like it - the better ;-). I like very much the idea of being able to use Python on the routers as an alternative to what we currently do in Lua. I can relate to your phrase: in many places where Lua is used currently, it is used only because of the lack of alternatives. Are you maintaining an OpenWrt package feed for MicroPython? We'd like to test using it for libre-mesh. No, I'm not maintaining OpetWRT package, I'm working on core implementation, standard library port, and web microframework currently, so it will take some time for me to make, test, and submit package recipe for it to OpenWRT. Well, that's why I posted - hoping that someone working closely on OpenWRT might get interested. What I did myself is built MicroPython using OpenWRT SDK, made sure it starts up on real hardware, as well as run testsuite using QEMU (running testsuite on real hardware is still on TODO). I pushed scripts I used to https://github.com/pfalcon/micropython/tree/cross (cross branch of https://github.com/pfalcon/micropython git repo), unix/build-mips.sh is the build script. Hope that will give an easy start for folks who want to try MicroPython on OpenWRT, and if someone will make recipe out of it, that will be just cool. Cheers, NicoEchániz -- Best regards, Paul mailto:pmis...@gmail.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] base-files: /lib/functions/network.sh: fix network_get_ipaddr6
When looking for the first ipaddr also consider the current prefix just
like network_get_ipaddrs6 does. If ipv6-address was empty the function
did not return the first ipaddr even if the list was non-empty.
fixes commit 83e9122f88a002871d5cdf421cf6aa6052b7e006
Signed-off-by: Henning Schild henn...@hennsch.de
---
package/base-files/Makefile | 2 +-
package/base-files/files/lib/functions/network.sh | 13 -
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 10724b3..8338514 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/version.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
-PKG_RELEASE:=155
+PKG_RELEASE:=156
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/lib/functions/network.sh
b/package/base-files/files/lib/functions/network.sh
index 86ab890..f4cf2b5 100644
--- a/package/base-files/files/lib/functions/network.sh
+++ b/package/base-files/files/lib/functions/network.sh
@@ -29,7 +29,18 @@ network_get_ipaddr() {
# 1: destination variable
# 2: interface
network_get_ipaddr6() {
- __network_ifstatus $1 $2 ['ipv6-address'][0].address;
+ local __addr
+
+ if __network_ifstatus __addr $2
['ipv6-address','ipv6-prefix-assignment'][0].address; then
+ case $__addr in
+ *:) export $1=${__addr}1 ;;
+ *) export $1=${__addr} ;;
+ esac
+ return 0
+ fi
+
+ unset $1
+ return 1
}
# determine first IPv4 subnet of given logical interface
--
1.8.5.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] base-files: /lib/functions/network.sh: fix network_get_ipaddr6
Hi Henning, committed in r42139 and merged to BB in r42140 - thank you! ~ Jow ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/3] build: add support for options
On Mon, Aug 11, 2014 at 06:59:15PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 6:34 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 05:24:32PM +0200, Jonas Gorski wrote: On Mon, Aug 11, 2014 at 5:06 PM, Luka Perkov l...@openwrt.org wrote: On Mon, Aug 11, 2014 at 03:21:58PM +0200, Jonas Gorski wrote: And further, in your approach you directly select the options, not just change the defaults (in contrast to the default packages), so you can't even deselect them anymore. You can deselect options with this series. That was the goal and that is why there are HAVE_* options present. Give it a try. So what is the difference to FEATURES:= then? These already select different HAVE_FOO things. Can't you just add the missing features there? FEATURES nor DEPENDS are not good candidates for this. They are global for target/subtarget. So you can not define in same target/subtarget for one profile to include only zImage and for other to include only uImage. You can see that does not work if you look how Freescale i.MX23/i.MX28 (mxs) now behaves. So the clean solution is to make them both work at the same time, not to add additional workarounds. Correct image generation should not depend on profile selection. All these options currently alter the way the single (ubi) rootfs is generated, while they should enable different rootfs variants to be generated at the same time. This is the root issue, and this is where it should be fixed. Yes, it isn't easy to fix, but we should not break it further. I agree with you but this does not only solve ubi image generation problem. As explained before with this we can enable other options as well, thus once we have better fix for ubi images we can keep this for other purposes. Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 2/3] build: use options to add kernels/dtbs in rootfs
On Mon, Aug 11, 2014 at 10:06:27PM +0200, Felix Fietkau wrote: On 2014-08-11 10:47, Luka Perkov wrote: Use support for options to enable targets and profiles select kernel or dtb inclusion by default. Signed-off-by: Luka Perkov l...@openwrt.org What's the rationale for having this stuff as config options in the first place? It seems to me that it makes a lot more sense to control this from the target's image/Makefile. Here are the reasons: * Simplified image/Makefile for targets, no extra ifdefs * Users can select if they want to include kernel/dtb or not - it is not hardcoded in the image/Makefile. For example, if one is building ramdisk image only no need to include kernel in rootfs. * Introduces ground work for including other options which can not be built as modules. Such as lxc/kexec support by default. Luka ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/3] brcm63xx: move generic profiles to top dir and remove smp profiles
Use generic profiles for brcm63xx instead of having similar profiles for each subtarget. Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com Signed-off-by: Jonas Gorski j...@openwrt.org --- diff --git a/target/linux/brcm63xx/generic/profiles/100-Broadcom.mk b/target/linux/brcm63xx/generic/profiles/100-Broadcom.mk deleted file mode 100644 index bc68f14..000 --- a/target/linux/brcm63xx/generic/profiles/100-Broadcom.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Broadcom - NAME:=Broadcom WiFi (default) - PACKAGES:=kmod-b43 wpad-mini -endef - -define Profile/Broadcom/Description - Package set compatible with hardware using Broadcom WiFi cards -endef -$(eval $(call Profile,Broadcom)) - diff --git a/target/linux/brcm63xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/brcm63xx/generic/profiles/101-Broadcom-wl.mk deleted file mode 100644 index 4f2d605..000 --- a/target/linux/brcm63xx/generic/profiles/101-Broadcom-wl.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Broadcom-wl - NAME:=Broadcom BCM43xx WiFi (wl, proprietary) - PACKAGES:= kmod-brcm-wl wlc nas -endef - -define Profile/Broadcom-wl/Description - Package set compatible with hardware using Broadcom BCM43xx cards - using the proprietary broadcom wireless wl driver. -endef - -$(eval $(call Profile,Broadcom-wl)) - diff --git a/target/linux/brcm63xx/generic/profiles/102-Atheros.mk b/target/linux/brcm63xx/generic/profiles/102-Atheros.mk deleted file mode 100644 index b214185..000 --- a/target/linux/brcm63xx/generic/profiles/102-Atheros.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Atheros - NAME:=Atheros WiFi (default) - PACKAGES:=kmod-ath5k kmod-ath9k wpad-mini -endef - -define Profile/Atheros/Description - Package set compatible with hardware using Atheros WiFi cards -endef -$(eval $(call Profile,Atheros)) - diff --git a/target/linux/brcm63xx/generic/profiles/103-Ralink.mk b/target/linux/brcm63xx/generic/profiles/103-Ralink.mk deleted file mode 100644 index 412c5a4..000 --- a/target/linux/brcm63xx/generic/profiles/103-Ralink.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Ralink - NAME:=Ralink WiFi - PACKAGES:=kmod-rt61-pci wpad-mini -endef -$(eval $(call Profile,Ralink)) - diff --git a/target/linux/brcm63xx/generic/profiles/104-No-WiFi.mk b/target/linux/brcm63xx/generic/profiles/104-No-WiFi.mk deleted file mode 100644 index 9b59b17..000 --- a/target/linux/brcm63xx/generic/profiles/104-No-WiFi.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/NoWiFi - NAME:=No WiFi (BCM6338) - PACKAGES:= -endef - -define Profile/NoWiFi/description - Package set compatible with BCM63xx routers without Wi-Fi (e.g: BCM6338-based). -endef - -$(eval $(call Profile,NoWiFi)) diff --git a/target/linux/brcm63xx/generic/profiles/105-Broadcom-brcmsmac.mk b/target/linux/brcm63xx/generic/profiles/105-Broadcom-brcmsmac.mk deleted file mode 100644 index bb558d1..000 --- a/target/linux/brcm63xx/generic/profiles/105-Broadcom-brcmsmac.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Broadcom-brcmsmac - NAME:=Broadcom WiFi (brcmsmac) - PACKAGES:=kmod-brcmsmac wpad-mini -endef - -define Profile/Broadcom-brcmsmac/Description - Package set compatible with hardware using Broadcom WiFi cards -endef -$(eval $(call Profile,Broadcom-brcmsmac)) - diff --git a/target/linux/brcm63xx/generic/profiles/200-GW6X00.mk b/target/linux/brcm63xx/generic/profiles/200-GW6X00.mk deleted file mode 100644 index 1cb763d..000 --- a/target/linux/brcm63xx/generic/profiles/200-GW6X00.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/GW6X00 - NAME:=Tecom GW6X00 - PACKAGES:=kmod-brcm-wl kmod-usb-core kmod-usb-ohci kmod-usb-storage \ - kmod-fs-ext4 kmod-nls-cp437 kmod-nls-iso8859-1 e2fsprogs \ - kmod-ipt-nathelper-extra wlc -endef - -define Profile/GW6X00/Description - Package set compatible with the Tecom GW6000
[OpenWrt-Devel] [PATCH 2/3] brcm63xx: add profiles for DTB supported devices
Remove generic profiles and add profiles for each DTB supported device. Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com Signed-off-by: Jonas Gorski j...@openwrt.org --- diff --git a/target/linux/brcm63xx/profiles/00-default.mk b/target/linux/brcm63xx/profiles/00-default.mk new file mode 100644 index 000..a25be92 --- /dev/null +++ b/target/linux/brcm63xx/profiles/00-default.mk @@ -0,0 +1,15 @@ +# +# Copyright (C) 2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/Default + NAME:=Default Profile + PACKAGES:=kmod-b43 wpad-mini +endef +define Profile/Default/description + Package set compatible with most boards. +endef +$(eval $(call Profile,Default)) diff --git a/target/linux/brcm63xx/profiles/01-generic.mk b/target/linux/brcm63xx/profiles/01-generic.mk new file mode 100644 index 000..b88e0fc --- /dev/null +++ b/target/linux/brcm63xx/profiles/01-generic.mk @@ -0,0 +1,15 @@ +# +# Copyright (C) 2014 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/96328avng + NAME:=Generic 96328avng + PACKAGES:= +endef +define Profile/96328avng/Description + Package set optimized for 96328avng. +endef +$(eval $(call Profile,96328avng)) diff --git a/target/linux/brcm63xx/profiles/100-Broadcom.mk b/target/linux/brcm63xx/profiles/100-Broadcom.mk deleted file mode 100644 index bc68f14..000 --- a/target/linux/brcm63xx/profiles/100-Broadcom.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Broadcom - NAME:=Broadcom WiFi (default) - PACKAGES:=kmod-b43 wpad-mini -endef - -define Profile/Broadcom/Description - Package set compatible with hardware using Broadcom WiFi cards -endef -$(eval $(call Profile,Broadcom)) - diff --git a/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk b/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk deleted file mode 100644 index 4f2d605..000 --- a/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (C) 2010 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Broadcom-wl - NAME:=Broadcom BCM43xx WiFi (wl, proprietary) - PACKAGES:= kmod-brcm-wl wlc nas -endef - -define Profile/Broadcom-wl/Description - Package set compatible with hardware using Broadcom BCM43xx cards - using the proprietary broadcom wireless wl driver. -endef - -$(eval $(call Profile,Broadcom-wl)) - diff --git a/target/linux/brcm63xx/profiles/102-Atheros.mk b/target/linux/brcm63xx/profiles/102-Atheros.mk deleted file mode 100644 index b214185..000 --- a/target/linux/brcm63xx/profiles/102-Atheros.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Atheros - NAME:=Atheros WiFi (default) - PACKAGES:=kmod-ath5k kmod-ath9k wpad-mini -endef - -define Profile/Atheros/Description - Package set compatible with hardware using Atheros WiFi cards -endef -$(eval $(call Profile,Atheros)) - diff --git a/target/linux/brcm63xx/profiles/103-Ralink.mk b/target/linux/brcm63xx/profiles/103-Ralink.mk deleted file mode 100644 index 412c5a4..000 --- a/target/linux/brcm63xx/profiles/103-Ralink.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Ralink - NAME:=Ralink WiFi - PACKAGES:=kmod-rt61-pci wpad-mini -endef -$(eval $(call Profile,Ralink)) - diff --git a/target/linux/brcm63xx/profiles/104-No-WiFi.mk b/target/linux/brcm63xx/profiles/104-No-WiFi.mk deleted file mode 100644 index 9b59b17..000 --- a/target/linux/brcm63xx/profiles/104-No-WiFi.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/NoWiFi - NAME:=No WiFi (BCM6338) - PACKAGES:= -endef - -define Profile/NoWiFi/description - Package set compatible with BCM63xx routers without Wi-Fi (e.g: BCM6338-based). -endef - -$(eval $(call Profile,NoWiFi)) diff --git a/target/linux/brcm63xx/profiles/105-Broadcom-brcmsmac.mk b/target/linux/brcm63xx/profiles/105-Broadcom-brcmsmac.mk deleted file mode 100644 index bb558d1..000 --- a/target/linux/brcm63xx/profiles/105-Broadcom-brcmsmac.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -
[OpenWrt-Devel] [PATCH 3/3] brcm63xx: tag images/dtbs with profiles
This prevents generating every supported image, except for de Default profile. Also fixes Neufbox 6 image generation. Signed-off-by: Álvaro Fernández Rojas nolt...@gmail.com Signed-off-by: Jonas Gorski j...@openwrt.org --- diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile index 8993565..d8e588d 100755 --- a/target/linux/brcm63xx/image/Makefile +++ b/target/linux/brcm63xx/image/Makefile @@ -32,9 +32,11 @@ $(shell expr substr $(1) 1 16) endef TARGET_DTBS:= - TARGET_IMAGES:= +TARGET_Default_DTBS:= +TARGET_Default_IMAGES:= + define Image/Build/CFE # Generate the tagged image $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \ @@ -185,11 +187,11 @@ endef define Image/Prepare $(call Image/PrepareCFELzmaKernel,) - $(foreach board,$(sort $(TARGET_DTBS)), $(call Image/PrepareCFELzmaKernelDTB,$(board))) + $(foreach board,$(sort $(TARGET_$(PROFILE)_DTBS)), $(call Image/PrepareCFELzmaKernelDTB,$(board))) ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Image/PrepareLoader,-initramfs) - $(foreach board,$(sort $(TARGET_DTBS)), $(call Image/PrepareLoaderDTB,-initramfs,$(board))) + $(foreach board,$(sort $(TARGET_$(PROFILE)_DTBS)), $(call Image/PrepareLoaderDTB,-initramfs,$(board))) endif rm -f $(KDIR)/fs_mark touch $(KDIR)/fs_mark @@ -201,13 +203,22 @@ define Image/Build/Initramfs $(call Image/Build/HCS,initramfs,cvg834g,a020,0001,0022,$(KDIR)/vmlinux-initramfs) endef +# $(1) = Profile +# $(2) = dtb +# $(3) = boardname +# $(4) = chipid +# $(5) = imagename +# $(6) = rsa signature +# $(7) = additional options define CfeImageDTB - define Image/Build/$(4) - $$(call Image/Build/CFEDTB,$$(1),$(1),$(2),$(3),$(4),$(5),$(6)) + define Image/Build/$(5) +$$(call Image/Build/CFEDTB,$$(1),$(2),$(3),$(4),$(5),$(6),$(7)) endef - - TARGET_DTBS += $(1) - TARGET_IMAGES += $(4) + + TARGET_Default_DTBS += $(2) + TARGET_Default_IMAGES += $(5) + TARGET_$(1)_DTBS += $(2) + TARGET_$(1)_IMAGES += $(5) endef @@ -335,43 +346,42 @@ define Image/Build $(call Image/Build/HCS,$(1),cvg834g,a020,0001,0022,$(KDIR)/vmlinux) # build dtb image list - $(foreach image,$(TARGET_IMAGES),$(call Image/Build/$(image),$(1))) + $(foreach image,$(TARGET_$(PROFILE)_IMAGES),$(call Image/Build/$(image),$(1))) ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Image/Build/Initramfs) endif endef -$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic,,--pad 2)) -$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,,--pad 4)) -$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,,--pad 8)) +# Generic 96328avng +$(eval $(call CfeImageDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic,,--pad 2)) +$(eval $(call CfeImageDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,,--pad 4)) +$(eval $(call CfeImageDTB,96328avng,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,,--pad 8)) # Asmax AR 1004g -$(eval $(call CfeImageDTB,ar1004g,96348GW-10,6348,AR1004G)) +$(eval $(call CfeImageDTB,AR1004G,ar1004g,96348GW-10,6348,AR1004G)) # Comtrend 536, 5621 -$(eval $(call CfeImageDTB,ct536plus,96348GW-11,6348,CT536_CT5621)) -# Tecom GW6000 -$(eval $(call CfeImageDTB,gw6000,96348GW,6348,GW6000)) -# Tecom GW6200 -$(eval $(call CfeImageDTB,gw6200,96348GW,6348,GW6200,$(shell printf '\x99'))) -# T-Com Speedport W 500V -$(eval $(call CfeImageDTB,spw500v,96348GW,6348,SPW500V)) +$(eval $(call CfeImageDTB,CT536_CT5621,ct536plus,96348GW-11,6348,CT536_CT5621)) # D-Link DSL-2740B/DSL-2741B, rev C2 -$(eval $(call CfeImageDTB,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) +$(eval $(call CfeImageDTB,DSL274XB_C,dsl-274xb-c,96358GW,6358,DSL274XB-C2)) # D-Link DSL-2740B/DSL-2741B, rev C3 -$(eval $(call CfeImageDTB,dsl-274xb-c,AW4139,6358,DSL274XB-C3)) +$(eval $(call CfeImageDTB,DSL274XB_C,dsl-274xb-c,AW4139,6358,DSL274XB-C3)) # D-Link DVA-G3810BN/TL -$(eval $(call CfeImageDTB,dva-g3810bn_tl,96358VW,6358,DVAG3810BN)) +$(eval $(call CfeImageDTB,DVAG3810BN,dva-g3810bn_tl,96358VW,6358,DVAG3810BN)) # Huawei HG556a -$(eval $(call CfeImageDTB,hg556a-a,HW556,6358,HG556a_A,EchoLife_HG556a,--image-offset 0x2 --block-size 0x1 --tag-version 8)) -$(eval $(call CfeImageDTB,hg556a-b,HW556,6358,HG556a_B,EchoLife_HG556a,--image-offset 0x2 --block-size 0x2 --tag-version 8)) -$(eval $(call CfeImageDTB,hg556a-c,HW556,6358,HG556a_C,EchoLife_HG556a,--image-offset 0x2 --block-size 0x2 --tag-version 8)) - +$(eval $(call CfeImageDTB,HG556a_AB,hg556a-a,HW556,6358,HG556a_A,EchoLife_HG556a,--image-offset 0x2 --block-size 0x1 --tag-version 8)) +$(eval $(call CfeImageDTB,HG556a_AB,hg556a-b,HW556,6358,HG556a_B,EchoLife_HG556a,--image-offset 0x2 --block-size 0x2 --tag-version 8)) +$(eval $(call
[OpenWrt-Devel] move socat into package feed
Hi all, i have a IPv6 internet connection at home where IPv4 support is available through a ds-lite tunnel. In order to connect to services running in my home network i have to use IPv6 from the outside. The easiest solution i found for 4to6 or 6to4 port forwarding is socat but it is currently not in the packages feed. I am not sure i would want to maintain the package, i just want to make the point that it is an important package and should be included in the feed. I wrote an init script for it, it currently lives in my files/ dir but i would be happy to contribute it. With IPv6 being more and more common i guess that even a luci frontend for it could be useful. regards, Henning ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
