[OpenWrt-Devel] PATCH two patches for the AP121 reference board (ar9331)
hi!
these are my first OpenWRT patches, sorry if i'm breaking any rules.
one of them fixes board name detection (and thus sysupgrade); the
other one adds a 8M flash target and rearranges the kernel size so
that the firmware files get built properly.
they are attached in the issue tracker also:
https://dev.openwrt.org/ticket/17885
https://dev.openwrt.org/ticket/14571
it would be great if they could get into CC final.
--
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“Few facts are more revealing than the direction people travel when
they vote with their feet.”
— Don Boudreaux, http://bit.ly/afZgx2
Index: target/linux/ar71xx/image/Makefile
===
--- target/linux/ar71xx/image/Makefile (revision 46302)
+++ target/linux/ar71xx/image/Makefile (working copy)
@@ -909,7 +909,8 @@
ap96_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1728k(kernel),64k(art)ro,7872k@0x4(firmware)
ap113_mtd_layout=mtdparts=spi0.0:64k(u-boot),3008k(rootfs),896k(uImage),64k(NVRAM),64k(ART),3904k@0x1(firmware)
ap121_mtdlayout_2M=mtdparts=spi0.0:64k(u-boot)ro,1216k(rootfs),704k(kernel),64k(art)ro,1920k@0x1(firmware)
-ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x5(firmware)
+ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2448k(rootfs),1200k(kernel),64k(nvram),64k(art)ro,3648k@0x5(firmware)
+ap121_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x5(firmware)
ap132_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),6400k(rootfs),64k(art),7808k@0x5(firmware)
ap135_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x5(firmware)
ap136_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(mib0),64k(art)ro,7744k@0x5(firmware)
@@ -1801,6 +1802,7 @@
$(eval $(call
SingleProfile,AthLzma,64k,AP113,ap113,AP113,ttyS0,115200,$$(ap113_mtd_layout),RK))
$(eval $(call
SingleProfile,AthLzma,64k,AP121_2M,ap121-2M,AP121,ttyATH0,115200,$$(ap121_mtdlayout_2M),RKuImage))
$(eval $(call
SingleProfile,AthLzma,64k,AP121_4M,ap121-4M,AP121,ttyATH0,115200,$$(ap121_mtdlayout_4M),RKuImage))
+$(eval $(call
SingleProfile,AthLzma,64k,AP121_8M,ap121-8M,AP121,ttyATH0,115200,$$(ap121_mtdlayout_8M),RKuImage))
$(eval $(call
SingleProfile,AthLzma,64k,AP121MINI,ap121-mini,AP121-MINI,ttyATH0,115200,$$(ap121_mtdlayout_4M),RKuImage))
$(eval $(call
SingleProfile,AthLzma,64k,AP132,ap132,AP132,ttyS0,115200,$$(ap132_mtdlayout),KRuImage))
$(eval $(call
SingleProfile,AthLzma,64k,AP135,ap135-020,AP135-020,ttyS0,115200,$$(ap135_mtdlayout),RKuImage))
@@ -1971,7 +1973,7 @@
$(eval $(call
SingleProfile,ZyXEL,64k,NBG_460N_550N_550NH,nbg460n_550n_550nh,NBG460N,ttyS0,115200,NBG-460N))
-$(eval $(call MultiProfile,AP121,AP121_2M AP121_4M))
+$(eval $(call MultiProfile,AP121,AP121_2M AP121_4M AP121_8M))
$(eval $(call MultiProfile,AP136,AP136_010 AP136_020))
$(eval $(call MultiProfile,EWDORIN, EWDORINAP EWDORINRT EWDORIN16M))
$(eval $(call MultiProfile,OPENMESH,OM2P OM5P MR600 MR900))
From 87c575fa7d7af18cafd55a682a8c6a492a9ff170 Mon Sep 17 00:00:00 2001
From: Attila Lendvai
Date: Wed, 5 Aug 2015 17:58:11 +0200
Subject: [PATCH] AP121: fix board detection in ar71xx.sh
---
target/linux/ar71xx/base-files/lib/ar71xx.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 4c10ab2..52faf08 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -344,7 +344,7 @@ ar71xx_board_detect() {
*AP113)
name="ap113"
;;
- *AP121)
+ *"AP121 reference board")
name="ap121"
;;
*AP121-MINI)
--
2.1.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Restore buildability of the AP121 target
hi! resending this patch properly, including a signed-off entry. it would be nice if this could make its way into CC, because this is a regression. the obsolete copy is this: https://patchwork.ozlabs.org/patch/508527/ -- • attila lendvai • PGP: 963F 5D5F 45C7 DFCD 0A39 -- “In a democracy, mass opinion creates power. Power diverts funds to the manufacturers of opinion, who manufacture more, etc. [...] This feedback loop generates a playing field on which the most competitive ideas are not those which best correspond to reality, but those which produce the strongest feedback.” — Mencius Moldbug From 91eb471c9ba1f4369e11eea2e454a1c4e0fe3fe2 Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Mon, 31 Aug 2015 12:44:33 +0200 Subject: [PATCH] Restore buildability of the AP121 target Increase space for kernel and also introduce a 8M flash target into the Makefile. Signed-off-by: Attila Lendvai --- target/linux/ar71xx/image/Makefile | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 3c77465..e89fdd6 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -926,7 +926,8 @@ ap83_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,128k(u-boot-env)ro,4096k(rootfs),3 ap96_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1728k(kernel),64k(art)ro,7872k@0x4(firmware) ap113_mtd_layout=mtdparts=spi0.0:64k(u-boot),3008k(rootfs),896k(uImage),64k(NVRAM),64k(ART),3904k@0x1(firmware) ap121_mtdlayout_2M=mtdparts=spi0.0:64k(u-boot)ro,1216k(rootfs),704k(kernel),64k(art)ro,1920k@0x1(firmware) -ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x5(firmware) +ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2448k(rootfs),1200k(kernel),64k(nvram),64k(art)ro,3648k@0x5(firmware) +ap121_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x5(firmware) ap132_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1408k(kernel),6400k(rootfs),64k(art),7808k@0x5(firmware) ap135_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x5(firmware) ap136_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(mib0),64k(art)ro,7744k@0x5(firmware) @@ -1837,6 +1838,7 @@ $(eval $(call SingleProfile,AthLzma,256k,ALL0315N,all0315n,ALL0315N,ttyS0,115200 $(eval $(call SingleProfile,AthLzma,64k,AP113,ap113,AP113,ttyS0,115200,$$(ap113_mtd_layout),RK)) $(eval $(call SingleProfile,AthLzma,64k,AP121_2M,ap121-2M,AP121,ttyATH0,115200,$$(ap121_mtdlayout_2M),RKuImage)) $(eval $(call SingleProfile,AthLzma,64k,AP121_4M,ap121-4M,AP121,ttyATH0,115200,$$(ap121_mtdlayout_4M),RKuImage)) +$(eval $(call SingleProfile,AthLzma,64k,AP121_8M,ap121-8M,AP121,ttyATH0,115200,$$(ap121_mtdlayout_8M),RKuImage)) $(eval $(call SingleProfile,AthLzma,64k,AP121MINI,ap121-mini,AP121-MINI,ttyATH0,115200,$$(ap121_mtdlayout_4M),RKuImage)) $(eval $(call SingleProfile,AthLzma,64k,AP132,ap132,AP132,ttyS0,115200,$$(ap132_mtdlayout),KRuImage)) $(eval $(call SingleProfile,AthLzma,64k,AP135,ap135-020,AP135-020,ttyS0,115200,$$(ap135_mtdlayout),RKuImage)) @@ -2011,7 +2013,7 @@ $(eval $(call SingleProfile,Zcomax,64k,ZCN1523H516,zcn-1523h-5-16,ZCN-1523H-5,tt $(eval $(call SingleProfile,ZyXEL,64k,NBG_460N_550N_550NH,nbg460n_550n_550nh,NBG460N,ttyS0,115200,NBG-460N)) -$(eval $(call MultiProfile,AP121,AP121_2M AP121_4M)) +$(eval $(call MultiProfile,AP121,AP121_2M AP121_4M AP121_8M)) $(eval $(call MultiProfile,AP136,AP136_010 AP136_020)) $(eval $(call MultiProfile,EWDORIN, EWDORINAP EWDORINRT EWDORIN16M)) $(eval $(call MultiProfile,OPENMESH,OM2P OM5P MR600 MR900)) -- 2.1.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] AP121 target: fix board detection in ar71xx.sh
hi!
resending this patch properly, including a signed-off entry.
it would be nice if this could make its way into CC, because this
fixes a regression.
the obsolete copy is this: https://patchwork.ozlabs.org/patch/508527/
--
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
We are all work-in-progress.
From 03ef01f8deeea2d2d84b8d6f99aeac96528d3ad5 Mon Sep 17 00:00:00 2001
From: Attila Lendvai
Date: Mon, 31 Aug 2015 12:45:32 +0200
Subject: [PATCH] AP121 target: fix board detection in ar71xx.sh
Signed-off-by: Attila Lendvai
---
target/linux/ar71xx/base-files/lib/ar71xx.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 4c10ab2..52faf08 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -344,7 +344,7 @@ ar71xx_board_detect() {
*AP113)
name="ap113"
;;
- *AP121)
+ *"AP121 reference board")
name="ap121"
;;
*AP121-MINI)
--
2.1.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] AP121 target: fix board detection in ar71xx.sh
Signed-off-by: Attila Lendvai
---
target/linux/ar71xx/base-files/lib/ar71xx.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh
b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index cacf362..d879a4b 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -344,7 +344,7 @@ ar71xx_board_detect() {
*AP113)
name="ap113"
;;
- *AP121)
+ *"AP121 reference board")
name="ap121"
;;
*AP121-MINI)
--
2.1.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] AP121 target: fix board detection in ar71xx.sh
> the patch needs to be sent inline. the email needs to have the subject > and description that is currently int he attachment. ok, i've sent it again using git send-email. the new patch is at: https://patchwork.ozlabs.org/patch/518448/ -- • attila lendvai • PGP: 963F 5D5F 45C7 DFCD 0A39 -- “If you argue and rankle and contradict, you may achieve a victory sometimes; but it will be an empty victory because you will never get your opponent's good will.” — Benjamin Franklin (1706–1790) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] SVN to GIT transition
> There is a big problem with git, which is identifying what OpenWrt > release your image is based off. With subversion, it is fairly easy, > you have a revision number that keeps incrementing. With git, asking > people to give you their git-describe output might be a little harder. > On the plus side, we would know if someone had tampered with the > sources (-dirty), but we would not be able to track down changes > easily if someone just created branches and added patches there, since > these would be objects and references that are not accessible. not sure if it solves everything, but there's this: https://github.com/sbcl/sbcl/blob/master/generate-version.sh given a disciplined tagging strategy, it extracts a version, which branch, and how many extra patches it has, and the end of the hash. an example: 1.2.15.6.branch-name.5-995ba66 -- • attila lendvai • PGP: 963F 5D5F 45C7 DFCD 0A39 -- “If you shut up truth and bury it under the ground, it will but grow, and gather to itself such explosive power that the day it bursts through it will knock down everything that stands in its way.” — Émile Zola (1840–1902) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] SVN to GIT transition
> Just my 2-cents > > IF it isn't BROKENplease DON'T fix it. the question here is: how much time coders (maintainers, contributors, and users) would spare if the administration was shifted to a different infrastructure. i cannot grow to like git (i still prefer darcs), but github simply provides so many extra goodies around git, and with such a smooth learning curve, that i think it's very much worth taking that road. i think it'd also be worth having a separate kernel fork (repo) as a git submodule under the openwrt git repo. it could have branches for the corresponding openwrt branches, and with its separate commit history it would make comparison with the mainline kernel way much simpler than it is today. potentially the same for some other projects as well, e.g. the toolchain repos? > Regarding downstream forks, would using Git also make it easier for > people like project turris to push appropriate changes back into > OpenWrt proper? git checkout -b fixing-this-and-that gitk [and cherrypick or tailor the branch with the gui as needed] git push go to github.com and create a pull request the whole process can be shorter than 5 minutes, and after that anyone can go and browse it among the open pull requests. some more 0.02, -- • attila lendvai • PGP: 963F 5D5F 45C7 DFCD 0A39 -- “Justice is not concerned with the results of the various transactions, but only with whether the transactions themselves are fair.” — F.A. Hayek (1899–1992), 'Law, Legislation and Liberty', I.6.j ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
