date:20131029

Re: [OpenWrt-Devel] [RFC TRY#2][PATCH] bgmac: pass received packet to the netif instead of copying it

2013-10-29 Thread Nathan Hintz

On Mon, 28 Oct 2013 18:42:22 +0100
Rafał Miłecki zaj...@gmail.com wrote:

Hi:

A few questions/comments inline...

Nathan

 Copying whole packets with skb_copy_from_linear_data_offset is a pretty
 bad idea. CPU was spending time in __copy_user_common and network
 performance was lower. With the new solution iperf-measured speed
 increased from 116Mb/s to 134Mb/s.
 
 Another way to improve performance could be switching to build_skb. It
 is cache-specific, so will require testing of various devices.
 
 Signed-off-by: Rafał Miłecki zaj...@gmail.com
 ---
  drivers/net/ethernet/broadcom/bgmac.c |   71 
 -
  1 file changed, 44 insertions(+), 27 deletions(-)
 
 diff --git a/drivers/net/ethernet/broadcom/bgmac.c 
 b/drivers/net/ethernet/broadcom/bgmac.c
 index 6b7541f..fde9a11 100644
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
 @@ -307,7 +307,6 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct 
 bgmac_dma_ring *ring,
   struct device *dma_dev = bgmac-core-dma_dev;
   struct bgmac_slot_info *slot = ring-slots[ring-start];
   struct sk_buff *skb = slot-skb;
 - struct sk_buff *new_skb;
   struct bgmac_rx_header *rx;
   u16 len, flags;
  
 @@ -320,38 +319,56 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, 
 struct bgmac_dma_ring *ring,
   len = le16_to_cpu(rx-len);
   flags = le16_to_cpu(rx-flags);
  
 - /* Check for poison and drop or pass the packet */
 - if (len == 0xdead  flags == 0xbeef) {
 - bgmac_err(bgmac, Found poisoned packet at slot %d, DMA 
 issue!\n,
 -   ring-start);
 - } else {
 + do {

old_skb duplicates skb stored above, can that one be used (renamed) instead 
of creating a new one here?

 + struct sk_buff *old_skb = slot-skb;
 + dma_addr_t old_dma_addr = slot-dma_addr;
 + int err;
 +
 + /* Check for poison and drop or pass the packet */
 + if (len == 0xdead  flags == 0xbeef) {
 + bgmac_err(bgmac, Found poisoned packet at slot 
 %d, DMA issue!\n,
 +   ring-start);

Nothing in the buffer has been changed by the cpu yet, so is this sync 
necessary?

 + dma_sync_single_for_device(dma_dev,
 +slot-dma_addr,
 +BGMAC_RX_BUF_SIZE,
 +DMA_FROM_DEVICE);
 + break;
 + }
 +
   /* Omit CRC. */
   len -= ETH_FCS_LEN;
  
 - new_skb = netdev_alloc_skb_ip_align(bgmac-net_dev, 
 len);
 - if (new_skb) {
 - skb_put(new_skb, len);
 - skb_copy_from_linear_data_offset(skb, 
 BGMAC_RX_FRAME_OFFSET,
 -  new_skb-data,
 -  len);
 - skb_checksum_none_assert(skb);
 - new_skb-protocol =
 - eth_type_trans(new_skb, bgmac-net_dev);
 - netif_receive_skb(new_skb);
 - handled++;
 - } else {
 - bgmac-net_dev-stats.rx_dropped++;
 - bgmac_err(bgmac, Allocation of skb for copying 
 packet failed!\n);
 + /* Prepare new skb as replacement */
 + err = bgmac_dma_rx_skb_for_slot(bgmac, slot);
 + if (err) {

I've sent a separate patch against bgmac_dma_rx_skb_for_slot to not corrupt 
the slot at all if an
error occurs (skb alloc or dma mapping), and free the skb that was allocated if 
a dma mapping error
occurs.  Assuming that patch is accepted, then the following two lines would 
not be needed.
With bgmac_dma_rx_skb_for_slot as it currently exists, this would leak an skb 
for a dma mapping
error (this was pre-existing to the changes in this patch).

 + slot-skb = old_skb;
 + slot-dma_addr = old_dma_addr;
 +
 + /* Poison the old skb */
 + rx-len = cpu_to_le16(0xdead);
 + rx-flags = cpu_to_le16(0xbeef);
 +
 + dma_sync_single_for_device(dma_dev,
 +slot-dma_addr,
 +BGMAC_RX_BUF_SIZE,
 +DMA_FROM_DEVICE);
 +

Re: [OpenWrt-Devel] [RFC TRY#2][PATCH] bgmac: pass received packet to the netif instead of copying it

2013-10-29 Thread Rafał Miłecki

2013/10/29 Nathan Hintz nlhi...@hotmail.com:
 On Mon, 28 Oct 2013 18:42:22 +0100
 Rafał Miłecki zaj...@gmail.com wrote:

 Hi:

 A few questions/comments inline...

 Nathan

 Copying whole packets with skb_copy_from_linear_data_offset is a pretty
 bad idea. CPU was spending time in __copy_user_common and network
 performance was lower. With the new solution iperf-measured speed
 increased from 116Mb/s to 134Mb/s.

 Another way to improve performance could be switching to build_skb. It
 is cache-specific, so will require testing of various devices.

 Signed-off-by: Rafał Miłecki zaj...@gmail.com
 ---
  drivers/net/ethernet/broadcom/bgmac.c |   71 
 -
  1 file changed, 44 insertions(+), 27 deletions(-)

 diff --git a/drivers/net/ethernet/broadcom/bgmac.c 
 b/drivers/net/ethernet/broadcom/bgmac.c
 index 6b7541f..fde9a11 100644
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
 @@ -307,7 +307,6 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct 
 bgmac_dma_ring *ring,
   struct device *dma_dev = bgmac-core-dma_dev;
   struct bgmac_slot_info *slot = ring-slots[ring-start];
   struct sk_buff *skb = slot-skb;
 - struct sk_buff *new_skb;
   struct bgmac_rx_header *rx;
   u16 len, flags;

 @@ -320,38 +319,56 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, 
 struct bgmac_dma_ring *ring,
   len = le16_to_cpu(rx-len);
   flags = le16_to_cpu(rx-flags);

 - /* Check for poison and drop or pass the packet */
 - if (len == 0xdead  flags == 0xbeef) {
 - bgmac_err(bgmac, Found poisoned packet at slot %d, 
 DMA issue!\n,
 -   ring-start);
 - } else {
 + do {

 old_skb duplicates skb stored above, can that one be used (renamed) 
 instead of creating a new one here?

I've focused on clean code too much. That won't be needed anyway when
I rebase my patch on top of yours.


 + struct sk_buff *old_skb = slot-skb;
 + dma_addr_t old_dma_addr = slot-dma_addr;
 + int err;
 +
 + /* Check for poison and drop or pass the packet */
 + if (len == 0xdead  flags == 0xbeef) {
 + bgmac_err(bgmac, Found poisoned packet at 
 slot %d, DMA issue!\n,
 +   ring-start);
 + dma_sync_single_for_device(dma_dev,
 +slot-dma_addr,
 +BGMAC_RX_BUF_SIZE,
 +DMA_FROM_DEVICE);

 Nothing in the buffer has been changed by the cpu yet, so is this sync 
 necessary?

I've moved your comment a line below, so it comments the code *above*.

I'm using LDD3 to understand DMA and it contains this explanation:

 void dma_sync_single_for_cpu(struct device *dev, dma_handle_t bus_addr,
 size_t size, enum dma_data_direction direction);

 This function should be called before the processor accesses a streaming DMA 
 buffer. Once the call has been made, the CPU “owns” the DMA buffer and can 
 work with it as needed. Before the device accesses the buffer, however, 
 ownership should be transferred back to it with:

 void dma_sync_single_for_device(struct device *dev, dma_handle_t bus_addr,
 size_t size, enum dma_data_direction direction);

So even if I didn't change anything in the buffer, I believe we still
need to sync it back to make it accessible to the hardware.


 I've sent a separate patch against bgmac_dma_rx_skb_for_slot to not corrupt 
 the slot at all if an
 error occurs (skb alloc or dma mapping), and free the skb that was allocated 
 if a dma mapping error
 occurs.  Assuming that patch is accepted, then the following two lines would 
 not be needed.
 With bgmac_dma_rx_skb_for_slot as it currently exists, this would leak an 
 skb for a dma mapping
 error (this was pre-existing to the changes in this patch).

Thanks, I'll rebase my patch.
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Convert cambria-setup.c to use ehci-platform driver

2013-10-29 Thread Michael Weiser

Hello Tim,

On Mon, Oct 28, 2013 at 09:40:00AM -0700, Tim Harvey wrote:

  Is there a conversion of cambria-setup.c to ehci-platform floating
  around somewhere?
 
  I'd be happy to give it a go myself if someone could give me a starting
  point on how to convert a ixp4xx-ehci user to ehci-platform.
 I haven't seen anything out there - please post what you have.  There are a

I don't have anything (yet). But I have found the following patch that
went over the arm-kernel mailing list causing some controversy as to
licensing so that it most likely hasn't made it into mainline:

http://www.spinics.net/lists/arm-kernel/msg274011.html

It does use ehci-platform.

Is there any documentation on how to convert a ehci-ixp4xx user to
ehci-platform? I can (and have done) such things by poking
around in the code and reverse engineering the data structures until it
seemed to work but it's tedious and error-prone.
-- 
Thanks,
Micha
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] build fails when uhttpd is built without TLS/SSL with r38575 / Trac fails for new tickets

2013-10-29 Thread Bastian Bittorf

again trac fails openening a new ticket, because of SPAM:

build fails when uhttpd is built without TLS/SSL with r38575:

{{{
make dirclean
rm .config
make menuconfig
- select brcm63xx
- select uhttpd
make
}}}

results in:
{{{
/home/bastian/63xx/openwrt/build_dir/target-mips_mips32_uClibc-0.9.33.2/ustream-ssl-cyassl/ustream-ssl-2013-07-24/ustream-io-cyassl.c:27:15:
error: conflicting
 types for 'CallbackIORecv'   
/home/bastian/63xx/openwrt/staging_dir/target-mips_mips32_uClibc-0.9.33.2/usr/include/cyassl/ssl.h:879:15:
note: previous declaration of 'CallbackIORecv' was h
ere
/home/bastian/63xx/openwrt/build_dir/target-mips_mips32_uClibc-0.9.33.2/ustream-ssl-cyassl/ustream-ssl-2013-07-24/ustream-io-cyassl.c:28:15:
error: conflicting
 types for 'CallbackIOSend'   
/home/bastian/63xx/openwrt/staging_dir/target-mips_mips32_uClibc-0.9.33.2/usr/include/cyassl/ssl.h:880:15:
note: previous declaration of 'CallbackIOSend' was h
ere
if [ -f
/home/bastian/63xx/openwrt/staging_dir/target-mips_mips32_uClibc-0.9.33.2/pkginfo/ubus.default.install.clean
]; then rm -f
/home/bastian/63xx/openwrt/staging_dir/target-mips_mips32_uClibc-0.9.33.2/pkginfo/ubus.default.install
/home/bastian/63xx/openwrt/staging_dir/target-mips_mips32_uClibc-0.9.33.2/pkginfo/ubus.default.install.clean;
fi; echo libubus 
/home/bastian/63xx/openwrt/staging_dir/target-mips_mips32_uClibc-0.9.33.2/pkginfo/ubus.default.install
make[6]: *** [CMakeFiles/ustream-ssl.dir/ustream-io-cyassl.c.o] Error 1
}}}

bye, bastian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] AR9344 wifi dying on WD N600 routers

2013-10-29 Thread omggo


 Im having a simikar issue with my wnr3700v2, the wifi just dont work
 nothing in logs :/


Is your router version 4 (even though the box says wnr3700v2).

I noticed in the wiki that version 4 has the same chipset as the WD n600,
the AR9344.


On Tue, Oct 29, 2013 at 1:53 PM, RealOpty realo...@gmail.com wrote:

  Im having a simikar issue with my wnr3700v2, the wifi just dont work
 nothing in logs :/

 RealOpty



 On 10/27/2013 3:47 PM, omggo wrote:

  Two WDR4300, a WR2543ND, and a WR1043ND (this one was bought and is
 used in the Netherlands).


  could it be that the WDR4300 you have is a different revision??


 On Sun, Oct 27, 2013 at 1:12 AM, Weedy weedy2...@gmail.com wrote:

 On Sat, Oct 26, 2013 at 8:35 AM, omggo oom...@gmail.com wrote:
  out of interest weedy, what tp-link devices do you have?

  Two WDR4300, a WR2543ND, and a WR1043ND (this one was bought and is
 used in the Netherlands).
 I also have a TL-WR702N or 703/710. I forget, the one that costs like
 15 bucks. I haven't touched it in ages so I don't know off hand.


  On Sat, Oct 26, 2013 at 3:03 AM, Weedy weedy2...@gmail.com wrote:
 
  On 25 Oct 2013 09:40, Alvaro Kuolas kuo...@gmail.com wrote:
  
   I have the same issue with different Atheros based routers, namely:
   TP-Link WDR4300, WDR4900, TL-WR841ND V1 and TL-WR841ND V2.
  
   WiFi it's quite unstable and I don't know where to look for debugging
   this issue.
 
  My tp-link devices are rock solid.
  I'm Canadian. Maybe is regional firmware thing?
 
 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel




 ___
 openwrt-devel mailing 
 listopenwrt-devel@lists.openwrt.orghttps://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] netifd macvlan support

2013-10-29 Thread Gui Iribarren


I'm trying to get a macvlan interface brought up by netifd
on last week openwrt trunk
BARRIER BREAKER (Bleeding Edge, r38505)
with netifd - 2013-10-19-566af724dad393fa127e07469dcc9ade62bd3a75

and i'm probably missing something very silly, but i'm not getting any 
reaction or error whatsoever. The whole network.lm_anygw=device  is ignored


root@48cf6b:~# uci show network
network.loopback=interface
network.loopback.ifname=lo
network.loopback.proto=static
network.loopback.ipaddr=127.0.0.1
network.loopback.netmask=255.0.0.0
network.lan=interface
network.lan.type=bridge
network.lan.proto=static
network.lan.netmask=255.255.255.0
network.lan.ip6addr=2A00:1508:1:F820:0:0:48:CF6B/64
network.lan.ipaddr=192.168.11.107
network.lan.ifname=eth0
network.wan=interface
network.wan.proto=dhcp
network.wan6=interface
network.wan6.ifname=@wan
network.wan6.proto=dhcpv6
network.@switch[0]=switch
network.@switch[0].name=switch0
network.@switch[0].reset=1
network.@switch[0].enable_vlan=1
network.@switch_vlan[0]=switch_vlan
network.@switch_vlan[0].device=switch0
network.@switch_vlan[0].vlan=1
network.@switch_vlan[0].ports=0 1 2 3 4
network.lm_anygw=device
network.lm_anygw.type=macvlan
network.lm_anygw.name=anygw
network.lm_anygw.ifname=eth1
network.lm_anygw.macaddr=aa:aa:aa:40:28:b5

root@48cf6b:~# ubus list
log
network
network.device
network.interface
network.interface.lan
network.interface.loopback
network.interface.wan
network.interface.wan6
service
system

i even tried the following, with same result (nothing)
network.wan.ifname=eth1
network.lm_anygw.ifname=@wan

no new / error messages in logread, nothing.
daemon.notice netifd: Interface 'lan' is now up
daemon.notice netifd: Interface 'loopback' is now up

and i couldn't find how to turn netifd into something more verbose...

any further help will be greatly appreciated, and i promise updating the 
wiki in return :)


cheers!
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] netifd macvlan support

2013-10-29 Thread Gui Iribarren


On 10/29/2013 01:31 PM, Gui Iribarren wrote:

I'm trying to get a macvlan interface brought up by netifd
on last week openwrt trunk
BARRIER BREAKER (Bleeding Edge, r38505)
with netifd - 2013-10-19-566af724dad393fa127e07469dcc9ade62bd3a75

and i'm probably missing something very silly, but i'm not getting any
reaction or error whatsoever. The whole network.lm_anygw=device  is ignored

root@48cf6b:~# uci show network
network.loopback=interface
network.loopback.ifname=lo
network.loopback.proto=static
network.loopback.ipaddr=127.0.0.1
network.loopback.netmask=255.0.0.0
network.lan=interface
network.lan.type=bridge
network.lan.proto=static
network.lan.netmask=255.255.255.0
network.lan.ip6addr=2A00:1508:1:F820:0:0:48:CF6B/64
network.lan.ipaddr=192.168.11.107
network.lan.ifname=eth0
network.wan=interface
network.wan.proto=dhcp
network.wan6=interface
network.wan6.ifname=@wan
network.wan6.proto=dhcpv6
network.@switch[0]=switch
network.@switch[0].name=switch0
network.@switch[0].reset=1
network.@switch[0].enable_vlan=1
network.@switch_vlan[0]=switch_vlan
network.@switch_vlan[0].device=switch0
network.@switch_vlan[0].vlan=1
network.@switch_vlan[0].ports=0 1 2 3 4
network.lm_anygw=device
network.lm_anygw.type=macvlan
network.lm_anygw.name=anygw
network.lm_anygw.ifname=eth1
network.lm_anygw.macaddr=aa:aa:aa:40:28:b5

root@48cf6b:~# ubus list
log
network
network.device
network.interface
network.interface.lan
network.interface.loopback
network.interface.wan
network.interface.wan6
service
system


ah! i'm getting *somewhere*, although not sure where

root@48cf6b:~# ubus call network.device status '{ name: anygw }'
{
external: false,
present: true,
type: MAC VLAN,
up: false,
parent: eth1,
statistics: {

}
}

so it seems it is actually recognizing the config section, but not 
bringing the device up for some reason?


right, i was missing a 'config interface' that would actually reference 
the new device

i.e.

network.if_anygw=interface
network.if_anygw.ifname=anygw
network.if_anygw.proto=static
network.if_anygw.ip6addr=2A00:1508:1:F820:0:0::1/64

now..

root@48cf6b:~# ip a s anygw
8: anygw@eth1: NO-CARRIER,BROADCAST,MULTICAST,UP mtu 1500 qdisc 
noqueue state LOWERLAYERDOWN group default

link/ether aa:aa:aa:40:28:b5 brd ff:ff:ff:ff:ff:ff
inet6 2a00:1508:1:f820::1/64 scope global tentative
   valid_lft forever preferred_lft forever

nice!

thanks a lot jow/nbd for the code, and the help!

cheers,

gui





i even tried the following, with same result (nothing)
network.wan.ifname=eth1
network.lm_anygw.ifname=@wan

no new / error messages in logread, nothing.
daemon.notice netifd: Interface 'lan' is now up
daemon.notice netifd: Interface 'loopback' is now up

and i couldn't find how to turn netifd into something more verbose...

any further help will be greatly appreciated, and i promise updating the
wiki in return :)

cheers!
___
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] netifd macvlan support

2013-10-29 Thread Felix Fietkau

On 2013-10-29 13:31, Gui Iribarren wrote:
 I'm trying to get a macvlan interface brought up by netifd
 on last week openwrt trunk
 BARRIER BREAKER (Bleeding Edge, r38505)
 with netifd - 2013-10-19-566af724dad393fa127e07469dcc9ade62bd3a75
 
 and i'm probably missing something very silly, but i'm not getting any 
 reaction or error whatsoever. The whole network.lm_anygw=device  is ignored
In netifd config language, a 'device' is not the same as an 'interface'.
The device section that you created should allow you to reference
'anygw' from an interface elsewhere. If you only want to create the
device without the interface (e.g. for batman-adv), you can create an
interface section with proto=none that points at the device.

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] [ar71xx] Support for HiWifi HC6361 router

2013-10-29 Thread Xiaoning Kang

From: Xiaoning Kang kan...@gmail.com

HiWifi HC6361(aka tw150v1) is a router developed by http://www.hiwifi.com,  
which is basically a WR703N with larger flash and ram.  It also carries a 4G 
emmc chip. The manufacturer had released a copy of modified openwrt sources at 
https://code.hiwifi.com/. so I tried to migrate those changes to openwrt trunk. 

Most of the changes were imported, with a few exceptions like button handling.  
The firmware builds and runs fine on my router.

Signed-off-by: Xiaoning Kang kan...@gmail.com
--

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh 
b/target/linux/ar71xx/base-files/etc/diag.sh
index 3962aa2..55e9a0b 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -149,6 +149,9 @@ get_status_led() {
tl-wr2543n)
status_led=tp-link:green:wps
;;
+   tw150v1)
+   status_led=tw150v1:green:system
+   ;;
unifi)
status_led=ubnt:green:dome
;;
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds 
b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index bd1c4b7..ed30755 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -229,6 +229,11 @@ tl-wr2543n)
ucidef_set_led_usbdev usb USB tp-link:green:usb 1-1
;;
 
+tw150v1)
+   ucidef_set_led_default inet INET tw150v1:green:internet 0
+   ucidef_set_led_wlan wlan WLAN tw150v1:green:wlan-2p4 wifi0tpt
+   ;;
+
 wrt160nl)
ucidef_set_led_wlan wlan WLAN wrt160nl:blue:wlan phy0tpt
;;
@@ -272,6 +277,10 @@ wzr-hp-g300nh)
ucidef_set_led_netdev router Router buffalo:green:router eth1
ucidef_set_led_usbdev usb USB buffalo:blue:usb 1-1
;;
+tw150v1)
+ucidef_set_led_default inet INET tw150v1:green:internet 0
+ucidef_set_led_wlan wlan WLAN tw150v1:green:wlan-2p4 wifi0tpt
+;;
 
 zcn-1523h-2)
ucidef_set_led_netdev lan1 lan1 zcn-1523h:green:lan1 eth0
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network 
b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 3d6ab29..03e30c4 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -271,6 +271,7 @@ tl-wdr3500 |\
 tl-wr741nd |\
 tl-wr741nd-v4 |\
 tl-wr841n-v7 |\
+tw150v1 |\
 whr-g301n |\
 whr-hp-g300n |\
 whr-hp-gn |\
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh 
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 06786e7..b5c50bd 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -573,6 +573,9 @@ ar71xx_board_detect() {
8devices Carambola2*)
name=carambola2
;;
+*Hiwifi Wireless HC6361 Board)
+name=tw150v1
+;;
esac
 
case $machine in
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh 
b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 28e4a91..5122c64 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -106,6 +106,13 @@ platform_check_image() {
}
return 0
;;
+   tw150v1)
+   [ $magic_long != 68737173 -a $magic_long != 2705 ]  {
+   echo Invalid image type.
+   return 1
+   }
+   return 0
+   ;;
ap81 | \
ap83 | \
ap132 | \
@@ -324,6 +331,9 @@ platform_do_upgrade() {
om2p-lc)
platform_do_upgrade_openmesh $ARGV
;;
+tw150v1)
+platform_do_upgrade_twarxx $ARGV
+;;
*)
default_do_upgrade $ARGV
;;
diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10
index f88d008..ee41ffd 100644
--- a/target/linux/ar71xx/config-3.10
+++ b/target/linux/ar71xx/config-3.10
@@ -84,6 +84,7 @@ CONFIG_ATH79_MACH_TL_WR741ND_V4=y
 CONFIG_ATH79_MACH_TL_WR841N_V1=y
 CONFIG_ATH79_MACH_TL_WR841N_V8=y
 CONFIG_ATH79_MACH_TL_WR941ND=y
+CONFIG_ATH79_MACH_TW150V1=y
 CONFIG_ATH79_MACH_UBNT=y
 CONFIG_ATH79_MACH_UBNT_XM=y
 CONFIG_ATH79_MACH_WHR_HP_G300N=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tw150v1.c 
b/target/linux/ar71xx/files/arch/mips/ath79/mach-tw150v1.c
new file mode 100644
index 000..738d890
--- /dev/null
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tw150v1.c
@@ -0,0 +1,194 @@
+/*
+ *  Hiwifi Wireless AR9331 Dreamboard (HORNET SoC) support
+ *
+ *  Copyright (C) 2012-2013 eric
+ *
+ *  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
+ *  by the Free Software

[OpenWrt-Devel] Installing Linux kernel image to rootfs

2013-10-29 Thread Yegor Yefremov

I want OpenWrt (12.09) to install Kernel (zImage/uImage) to /boot.
What *.mk file should I change? So far I could only find BIN_DIR in
include/kernel-build.mk, but it is for kernel-debug.tar.bz2.

Regards,
Yegor
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

2013-10-29 Thread Felix Fietkau

On 2013-10-29 15:27, Yegor Yefremov wrote:
 I want OpenWrt (12.09) to install Kernel (zImage/uImage) to /boot.
 What *.mk file should I change? So far I could only find BIN_DIR in
 include/kernel-build.mk, but it is for kernel-debug.tar.bz2.
What platform, and why?

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

2013-10-29 Thread Yegor Yefremov

On Tue, Oct 29, 2013 at 3:42 PM, Felix Fietkau n...@openwrt.org wrote:
 On 2013-10-29 15:27, Yegor Yefremov wrote:
 I want OpenWrt (12.09) to install Kernel (zImage/uImage) to /boot.
 What *.mk file should I change? So far I could only find BIN_DIR in
 include/kernel-build.mk, but it is for kernel-debug.tar.bz2.
 What platform, and why?

Platform is irrelevant (ARM: KS8695 and OMAP3), because before OpenWrt
another small Linux image will be started (aka BIOS for maintenance
purposes) and OpenWrt's Kernel will be invoked via kexec. Buildroot
has such an option upstream, where you can choose folder you want to
install the kernel image to (see BR2_LINUX_KERNEL_INSTALL_TARGET).

Yegor
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] libnetfilter-conntrack: update to 1.0.4

2013-10-29 Thread Ulrich Weber

update libnetfilter-conntrack to 1.0.4

Signed-off-by: Ulrich Weber u...@xyne.com
---
 package/libs/libnetfilter-conntrack/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libs/libnetfilter-conntrack/Makefile 
b/package/libs/libnetfilter-conntrack/Makefile
index 43413a7..3d7a376 100644
--- a/package/libs/libnetfilter-conntrack/Makefile
+++ b/package/libs/libnetfilter-conntrack/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnetfilter_conntrack
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
http://www.netfilter.org/projects/libnetfilter_conntrack/files/ \
ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/
-PKG_MD5SUM:=73394a3d8d0cfecc6abb6027b4792d52
+PKG_MD5SUM:=18cf80c4b339a3285e78822dbd4f08d7
 PKG_MAINTAINER:=Jo-Philipp Wich j...@openwrt.org
 
 PKG_FIXUP:=autoreconf
-- 
1.8.1.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] lldpd: update to 0.7.6, add lldpcli

2013-10-29 Thread Ulrich Weber

lldpctl symlinks to lldpcli

Signed-off-by: Ulrich Weber u...@xyne.com
---
 package/network/services/lldpd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/network/services/lldpd/Makefile 
b/package/network/services/lldpd/Makefile
index d850b11..5b634eb 100644
--- a/package/network/services/lldpd/Makefile
+++ b/package/network/services/lldpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lldpd
-PKG_VERSION:=0.7.5
+PKG_VERSION:=0.7.6
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://media.luffy.cx/files/lldpd
-PKG_MD5SUM:=2b3e91264dd7605b498051af6b749b47
+PKG_MD5SUM:=dbd90a68b91448dcb94a4a77c5d8ef65
 
 PKG_MAINTAINER:=Jo-Philipp Wich j...@openwrt.org
 
@@ -46,7 +46,7 @@ define Package/lldpd/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/sbin
-   $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lldp{ctl,d} $(1)/usr/sbin/
+   $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lldp{cli,ctl,d} $(1)/usr/sbin/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblldpctl.so* $(1)/usr/lib/
$(INSTALL_BIN) ./files/lldpd.init $(1)/etc/init.d/lldpd
$(INSTALL_DATA) ./files/lldpd.config $(1)/etc/config/lldpd
-- 
1.8.1.2
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

2013-10-29 Thread Felix Fietkau

On 2013-10-29 15:54, Yegor Yefremov wrote:
 On Tue, Oct 29, 2013 at 3:42 PM, Felix Fietkau n...@openwrt.org wrote:
 On 2013-10-29 15:27, Yegor Yefremov wrote:
 I want OpenWrt (12.09) to install Kernel (zImage/uImage) to /boot.
 What *.mk file should I change? So far I could only find BIN_DIR in
 include/kernel-build.mk, but it is for kernel-debug.tar.bz2.
 What platform, and why?
 
 Platform is irrelevant (ARM: KS8695 and OMAP3), because before OpenWrt
 another small Linux image will be started (aka BIOS for maintenance
 purposes) and OpenWrt's Kernel will be invoked via kexec. Buildroot
 has such an option upstream, where you can choose folder you want to
 install the kernel image to (see BR2_LINUX_KERNEL_INSTALL_TARGET).
There's no option for that yet, but feel free to propose a patch that
adds such a config option.
BIN_DIR refers to bin/platform not the rootfs staging directory.
It should be copied to $(TARGET_DIR), probably from image.mk in this
template: Image/mkfs/prepare/default

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

2013-10-29 Thread Yegor Yefremov

On Tue, Oct 29, 2013 at 4:16 PM, Felix Fietkau n...@openwrt.org wrote:
 On 2013-10-29 15:54, Yegor Yefremov wrote:
 On Tue, Oct 29, 2013 at 3:42 PM, Felix Fietkau n...@openwrt.org wrote:
 On 2013-10-29 15:27, Yegor Yefremov wrote:
 I want OpenWrt (12.09) to install Kernel (zImage/uImage) to /boot.
 What *.mk file should I change? So far I could only find BIN_DIR in
 include/kernel-build.mk, but it is for kernel-debug.tar.bz2.
 What platform, and why?

 Platform is irrelevant (ARM: KS8695 and OMAP3), because before OpenWrt
 another small Linux image will be started (aka BIOS for maintenance
 purposes) and OpenWrt's Kernel will be invoked via kexec. Buildroot
 has such an option upstream, where you can choose folder you want to
 install the kernel image to (see BR2_LINUX_KERNEL_INSTALL_TARGET).
 There's no option for that yet, but feel free to propose a patch that
 adds such a config option.
 BIN_DIR refers to bin/platform not the rootfs staging directory.
 It should be copied to $(TARGET_DIR), probably from image.mk in this
 template: Image/mkfs/prepare/default

Thanks. I just wanted to know, which script is responsible for placing
openwrt-platform-zImage to bin/platform i.e. BIN_DIR?
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

2013-10-29 Thread John Crispin


On 29/10/13 16:26, Yegor Yefremov wrote:

On Tue, Oct 29, 2013 at 4:16 PM, Felix Fietkaun...@openwrt.org  wrote:

On 2013-10-29 15:54, Yegor Yefremov wrote:

On Tue, Oct 29, 2013 at 3:42 PM, Felix Fietkaun...@openwrt.org  wrote:

On 2013-10-29 15:27, Yegor Yefremov wrote:

I want OpenWrt (12.09) to install Kernel (zImage/uImage) to /boot.
What *.mk file should I change? So far I could only find BIN_DIR in
include/kernel-build.mk, but it is for kernel-debug.tar.bz2.

What platform, and why?


Platform is irrelevant (ARM: KS8695 and OMAP3), because before OpenWrt
another small Linux image will be started (aka BIOS for maintenance
purposes) and OpenWrt's Kernel will be invoked via kexec. Buildroot
has such an option upstream, where you can choose folder you want to
install the kernel image to (see BR2_LINUX_KERNEL_INSTALL_TARGET).

There's no option for that yet, but feel free to propose a patch that
adds such a config option.
BIN_DIR refers to bin/platform  not the rootfs staging directory.
It should be copied to $(TARGET_DIR), probably from image.mk in this
template: Image/mkfs/prepare/default


Thanks. I just wanted to know, which script is responsible for placing
openwrt-platform-zImage to bin/platform i.e. BIN_DIR?



target/linux/${arch}/image/Makefile
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

2013-10-29 Thread Felix Fietkau

On 2013-10-29 16:26, Yegor Yefremov wrote:
 On Tue, Oct 29, 2013 at 4:16 PM, Felix Fietkau n...@openwrt.org wrote:
 On 2013-10-29 15:54, Yegor Yefremov wrote:
 On Tue, Oct 29, 2013 at 3:42 PM, Felix Fietkau n...@openwrt.org wrote:
 On 2013-10-29 15:27, Yegor Yefremov wrote:
 I want OpenWrt (12.09) to install Kernel (zImage/uImage) to /boot.
 What *.mk file should I change? So far I could only find BIN_DIR in
 include/kernel-build.mk, but it is for kernel-debug.tar.bz2.
 What platform, and why?

 Platform is irrelevant (ARM: KS8695 and OMAP3), because before OpenWrt
 another small Linux image will be started (aka BIOS for maintenance
 purposes) and OpenWrt's Kernel will be invoked via kexec. Buildroot
 has such an option upstream, where you can choose folder you want to
 install the kernel image to (see BR2_LINUX_KERNEL_INSTALL_TARGET).
 There's no option for that yet, but feel free to propose a patch that
 adds such a config option.
 BIN_DIR refers to bin/platform not the rootfs staging directory.
 It should be copied to $(TARGET_DIR), probably from image.mk in this
 template: Image/mkfs/prepare/default
 
 Thanks. I just wanted to know, which script is responsible for placing
 openwrt-platform-zImage to bin/platform i.e. BIN_DIR?
That's done in the target image makefile. If you need the specific
kernel platform images (instead of something you can make from generic
vmlinux), then you need to do this in the actual target Makefile and not
in generic code.

- Felix
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] [packages] send: move patch to right location

2013-10-29 Thread Michael Heimpold

Signed-off-by: Michael Heimpold m...@heimpold.de
---
 ipv6/send/Makefile |2 +-
 {send = ipv6/send}/patches/007-use-flex.patch |0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {send = ipv6/send}/patches/007-use-flex.patch (100%)

diff --git a/ipv6/send/Makefile b/ipv6/send/Makefile
index 34a1a4f..ca60c23 100644
--- a/ipv6/send/Makefile
+++ b/ipv6/send/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=send
 PKG_VERSION:=0.2-5.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)d_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://mobisend.org/debian-mobisend/pool/main/s/sendd/
diff --git a/send/patches/007-use-flex.patch 
b/ipv6/send/patches/007-use-flex.patch
similarity index 100%
rename from send/patches/007-use-flex.patch
rename to ipv6/send/patches/007-use-flex.patch
-- 
1.7.10.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] [packages] postgresql: fix build due to missing link to libpthread

2013-10-29 Thread Michael Heimpold

This fixes the following linker error:

./../src/interfaces/libpq/libpq.so: undefined reference to `pthread_sigmask'

Signed-off-by: Michael Heimpold m...@heimpold.de
---
 libs/postgresql/Makefile |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 37ae8f6..fb643ca 100644
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql
 PKG_VERSION:=9.0.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
@@ -154,7 +154,7 @@ define Build/Configure
$(SED) 's@ECPG = ../../preproc/ecpg@ECPG = ../../preproc/ecpg.host@' 
$(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
 endef
 
-TARGET_CFLAGS += $(FPIC)
+TARGET_CFLAGS += $(FPIC) -lpthread
 
 # because PROFILE means something else in the project Makefile
 unexport PROFILE
-- 
1.7.10.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] build root output binary package name

2013-10-29 Thread cmsv


I think that someone has asked the same a while ago but i lost track of
the email in the mailing list so here it goes again.

I have been having some difficulty in finding the source code file that
is responsible for the binary package prefix name.
In other words the file that prefixes a very package with openwrt-
The idea is to output a different name. Maybe there another method.

Can anyone shed some light here?

























-- 





Site: http://wirelesspt.net
Mesh: http://tinyurl.com/wirelesspt
Admin: http://wirelesspt.net/wiki/Cmsv
Twitter: http://twitter.com/wirelesspt
Youtube: https://youtube.com/wirelesspt
Suporte técnico via sms: 91 19 11 798
Donativos/Paypal: http://tinyurl.com/doar-verba
Chave publica PGP/SSH: http://wirelesspt.net/arquivos/pk
Licença deste conteúdo:
https://creativecommons.org/licenses/by-nc-sa/3.0/pt/
Email assinado digitalmente pelo emissor assegurando autenticidade
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] cns3xxx: add pushbutton GPIO for GW2380/82/83

2013-10-29 Thread Tim Harvey

Signed-off-by: Tim Harvey thar...@gateworks.com
---
 .../cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c   |3 +++
 1 file changed, 3 insertions(+)

diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c 
b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
index 9c835f3..267b4c1 100644
--- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
+++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
@@ -723,6 +723,7 @@ static struct gpio laguna_gpio_gw2383[] = {
{   8, GPIOF_IN   , GPIO1 },
{ 100, GPIOF_IN   , DIO0 },
{ 101, GPIOF_IN   , DIO1 },
+   { 108, GPIOF_IN   , *USER_PB# },
 };
 
 static struct gpio laguna_gpio_gw2382[] = {
@@ -735,6 +736,7 @@ static struct gpio laguna_gpio_gw2382[] = {
{  10, GPIOF_OUT_INIT_HIGH, *USB_PCI_SEL# },
{ 100, GPIOF_IN   , DIO0 },
{ 101, GPIOF_IN   , DIO1 },
+   { 108, GPIOF_IN   , *USER_PB# },
 };
 
 static struct gpio laguna_gpio_gw2380[] = {
@@ -746,6 +748,7 @@ static struct gpio laguna_gpio_gw2380[] = {
{ 101, GPIOF_IN   , DIO1 },
{ 102, GPIOF_IN   , DIO2 },
{ 103, GPIOF_IN   , DIO3 },
+   { 108, GPIOF_IN   , *USER_PB# },
 };
 
 /*
-- 
1.7.9.5
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

[OpenWrt-Devel] [PATCH] cns3xxx: add uImage image build

2013-10-29 Thread Tim Harvey

- add building of a standard uImage along with the combined kernel+rootfs
- remove 'old' image build - that was for a very old and obsolete bootloader

To update the bootloader for GW2387,GW2388,GW2391 (NOR Flash) from uboot:
put latest NOR bootloader on tftp server:

http://svn.gateworks.com/laguna/trunk/images/u-boot_nor.bin

 Laguna setenv ipaddr localip
 Laguna setenv ipaddr serverip
 Laguna tftpboot 0x80 laguna/u-boot-nor.bin
 Laguna erase 0x1000 +$(filesize)
 Laguna cp.b 0x80 0x1000 $(filesize)
 Laguna reset

To update the bootloader for GW2380,GW2382,GW2383 (SPI Flash) from uboot:
put latest SPI bootloader on tftp server:

http://svn.gateworks.com/laguna/trunk/images/u-boot_spi.bin

 Laguna setenv ipaddr localip
 Laguna setenv ipaddr serverip
 Laguna tftpboot 0x80 laguna/u-boot-spi.bin
 Laguna erase 0x6000 +$(filesize)
 Laguna cp.b 0x80 0x6000 $(filesize)
 Laguna reset

Signed-off-by: Tim Harvey thar...@gateworks.com
---
 target/linux/cns3xxx/image/Makefile |   42 +--
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/target/linux/cns3xxx/image/Makefile 
b/target/linux/cns3xxx/image/Makefile
index 7fa0b35..639af35 100644
--- a/target/linux/cns3xxx/image/Makefile
+++ b/target/linux/cns3xxx/image/Makefile
@@ -7,26 +7,20 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-define mkimage
-   mkimage -A arm -O linux -T kernel -C none -a $(2) -e $(2) -n 'OpenWrt 
Linux-$(LINUX_VERSION)' -d $(KDIR)/zImage $(KDIR)/uImage-$(1)
-endef
-
 define Image/Prepare
-   $(call mkimage,old,0x8000)
-   $(call mkimage,new,0x20008000)
+   mkimage -A arm -O linux -T kernel -C none -a 0x20008000 -e 0x20008000 
-n 'OpenWrt Linux-$(LINUX_VERSION)' -d $(LINUX_DIR)/arch/arm/boot/zImage 
$(KDIR)/uImage
 endef
 
 # Build sysupgrade image
 define BuildFirmware/Generic
-   dd if=$(KDIR)/uImage-old of=$(KDIR)/uImage-old.pad bs=64k conv=sync; \
-   dd if=$(KDIR)/uImage-new of=$(KDIR)/uImage-new.pad bs=64k conv=sync; \
+   dd if=$(KDIR)/uImage of=$(KDIR)/uImage.pad bs=64k conv=sync; \
dd if=$(KDIR)/root.$(1) of=$(KDIR)/root.$(1).pad bs=128k conv=sync; \
sh $(TOPDIR)/scripts/combined-image.sh \
-   $(KDIR)/uImage-old.pad \
+   $(KDIR)/uImage.pad \
$(KDIR)/root.$(1).pad \
-   $(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst 
squashfs-%,squashfs,$(1)))-old-uboot-sysupgrade.bin
+   $(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst 
squashfs-%,squashfs,$(1)))-uboot-sysupgrade.bin
sh $(TOPDIR)/scripts/combined-image.sh \
-   $(KDIR)/uImage-new.pad \
+   $(KDIR)/uImage.pad \
$(KDIR)/root.$(1).pad \
$(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst 
squashfs-%,squashfs,$(1)))-sysupgrade.bin
 endef
@@ -34,40 +28,36 @@ endef
 define Image/Build
$(call Image/Build/$(1),$(1))
$(call BuildFirmware/Generic,$(1))
+   cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
 endef
 
 define Image/Build/jffs2-64k
+   dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=64k 
conv=sync
( \
-   dd if=$(KDIR)/uImage-old bs=2048k conv=sync; \
-   dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
-   )  $(BIN_DIR)/$(IMG_PREFIX)-old-uboot-$(1).bin
-   ( \
-   dd if=$(KDIR)/uImage-new bs=2048k conv=sync; \
+   dd if=$(KDIR)/uImage bs=2048k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
)  $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
 endef
 
 define Image/Build/jffs2-128k
+   dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=128k 
conv=sync
( \
-   dd if=$(KDIR)/uImage-old bs=2048k conv=sync; \
-   dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-   )  $(BIN_DIR)/$(IMG_PREFIX)-old-uboot-$(1).bin
-   ( \
-   dd if=$(KDIR)/uImage-new bs=2048k conv=sync; \
+   dd if=$(KDIR)/uImage bs=2048k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
)  $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
 endef
 
 define Image/Build/squashfs
$(call prepare_generic_squashfs,$(KDIR)/root.$(1))
+   dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=128k 
conv=sync
( \
-   dd if=$(KDIR)/uImage-old bs=2048k conv=sync; \
+   dd if=$(KDIR)/uImage bs=2048k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-   )  $(BIN_DIR)/$(IMG_PREFIX)-old-uboot-$(1).bin
+   )  $(BIN_DIR)/$(IMG_PREFIX)-$(1)_laguna_nor.bin
( \
-   dd if=$(KDIR)/uImage-new bs=2048k conv=sync; \
-   dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-   )  $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
+   dd if=$(KDIR)/uImage bs=1536k conv=sync; \
+   dd if=$(KDIR)/root.$(1) bs=256k conv=sync; \
+   )  $(BIN_DIR)/$(IMG_PREFIX)-$(1)_laguna_spi.bin
 endef
 
 $(eval $(call BuildImage))
-- 
1.7.9.5

Re: [OpenWrt-Devel] [RFC TRY#2][PATCH] bgmac: pass received packet to the netif instead of copying it

Re: [OpenWrt-Devel] [RFC TRY#2][PATCH] bgmac: pass received packet to the netif instead of copying it

Re: [OpenWrt-Devel] Convert cambria-setup.c to use ehci-platform driver

[OpenWrt-Devel] build fails when uhttpd is built without TLS/SSL with r38575 / Trac fails for new tickets

Re: [OpenWrt-Devel] AR9344 wifi dying on WD N600 routers

[OpenWrt-Devel] netifd macvlan support

Re: [OpenWrt-Devel] netifd macvlan support

Re: [OpenWrt-Devel] netifd macvlan support

[OpenWrt-Devel] [PATCH] [ar71xx] Support for HiWifi HC6361 router

[OpenWrt-Devel] Installing Linux kernel image to rootfs

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

[OpenWrt-Devel] [PATCH] libnetfilter-conntrack: update to 1.0.4

[OpenWrt-Devel] [PATCH] lldpd: update to 0.7.6, add lldpcli

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

Re: [OpenWrt-Devel] Installing Linux kernel image to rootfs

[OpenWrt-Devel] [PATCH] [packages] send: move patch to right location

[OpenWrt-Devel] [PATCH] [packages] postgresql: fix build due to missing link to libpthread

[OpenWrt-Devel] build root output binary package name

[OpenWrt-Devel] [PATCH] cns3xxx: add pushbutton GPIO for GW2380/82/83

[OpenWrt-Devel] [PATCH] cns3xxx: add uImage image build

23 matches

Site Navigation

Mail list logo

Footer information