[OpenWrt-Devel] [PATCH] ar71xx: update Carambola2 platform data

2014-07-15 Thread Mantas Pucka 
Tested building for carambola2 target.

Signed-off-by: Mantas Pucka man...@8devices.com
---
 target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c | 9 -
 target/linux/ar71xx/image/Makefile  | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c 
b/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
index e7bc861..babe101 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
@@ -25,7 +25,6 @@
 #define CARAMBOLA2_GPIO_LED_ETH1   13
 
 #define CARAMBOLA2_GPIO_BTN_JUMPSTART  11
-#define CARAMBOLA2_GPIO_BTN_RESET  12
 
 #define CARAMBOLA2_KEYS_POLL_INTERVAL  20  /* msecs */
 #define CARAMBOLA2_KEYS_DEBOUNCE_INTERVAL  (3 * 
CARAMBOLA2_KEYS_POLL_INTERVAL)
@@ -60,14 +59,6 @@ static struct gpio_keys_button carambola2_gpio_keys[] 
__initdata = {
.gpio   = CARAMBOLA2_GPIO_BTN_JUMPSTART,
.active_low = 1,
},
-   {
-   .desc   = reset button,
-   .type   = EV_KEY,
-   .code   = KEY_RESTART,
-   .debounce_interval = CARAMBOLA2_KEYS_DEBOUNCE_INTERVAL,
-   .gpio   = CARAMBOLA2_GPIO_BTN_RESET,
-   .active_low = 1,
-   }
 };
 
 static void __init carambola2_common_setup(void)
diff --git a/target/linux/ar71xx/image/Makefile 
b/target/linux/ar71xx/image/Makefile
index 822f95d..2b88a8f 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -248,7 +248,7 @@ 
ap96_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),17
 
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)
-carambola2_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15936k(firmware),64k(nvram),64k(art)ro
+carambola2_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
 
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)
-- 
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] [PATCH] ar71xx: update Carambola2 platform data

2014-07-15 Thread Mantas Pucka 

Sorry, change list got cut off in previous mail:

ar71xx: update Carambola2 platform data

 * Remove button info on GPIO12, there is no button there.
 * Remove nvram mtd partition, as it's not used for anything, saves 
64k for user data

Tested building for carambola2 target.

Signed-off-by: Mantas Pucka man...@8devices.com
---
  target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c | 9 -
  target/linux/ar71xx/image/Makefile  | 2 +-
  2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c 
b/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
index e7bc861..babe101 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-carambola2.c
@@ -25,7 +25,6 @@
  #define CARAMBOLA2_GPIO_LED_ETH1  13
  
  #define CARAMBOLA2_GPIO_BTN_JUMPSTART		11

-#define CARAMBOLA2_GPIO_BTN_RESET  12
  
  #define CARAMBOLA2_KEYS_POLL_INTERVAL		20	/* msecs */

  #define CARAMBOLA2_KEYS_DEBOUNCE_INTERVAL (3 * 
CARAMBOLA2_KEYS_POLL_INTERVAL)
@@ -60,14 +59,6 @@ static struct gpio_keys_button carambola2_gpio_keys[] 
__initdata = {
.gpio   = CARAMBOLA2_GPIO_BTN_JUMPSTART,
.active_low = 1,
},
-   {
-   .desc   = reset button,
-   .type   = EV_KEY,
-   .code   = KEY_RESTART,
-   .debounce_interval = CARAMBOLA2_KEYS_DEBOUNCE_INTERVAL,
-   .gpio   = CARAMBOLA2_GPIO_BTN_RESET,
-   .active_low = 1,
-   }
  };
  
  static void __init carambola2_common_setup(void)

diff --git a/target/linux/ar71xx/image/Makefile 
b/target/linux/ar71xx/image/Makefile
index 822f95d..2b88a8f 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -248,7 +248,7 @@ 
ap96_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),17
  
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)
-carambola2_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,15936k(firmware),64k(nvram),64k(art)ro
+carambola2_mtdlayout_16M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
  
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)

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

Re: [OpenWrt-Devel] [PATCH] ar71xx: update Carambola2 platform data

2014-07-15 Thread Felix Fietkau 
On 2014-07-15 12:53, Mantas Pucka wrote:
 Sorry, change list got cut off in previous mail:
 
 ar71xx: update Carambola2 platform data
 
   * Remove button info on GPIO12, there is no button there.
   * Remove nvram mtd partition, as it's not used for anything, saves 
 64k for user data
Your patch is mangled by broken line wrapping. Please fix and resend
with the change list included in the message.

Thanks,

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