Skip to content
Snippets Groups Projects
Commit f36f5784 authored by jogo's avatar jogo
Browse files

brcm63xx: add dts and profile for Livebox 


Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44559 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent a29c7e5a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
target/linux/brcm63xx/dts/livebox-blue-5g.dts 0 → 100644
+ 15
− 0
View file @ f36f5784
/dts-v1/;
/include/ "bcm6348.dtsi"
/ {
model = "Inventel Livebox 1";
compatible = "inventel,livebox-blue-5g", "brcm,bcm6348";
};
&pflash {
reg = <0x1e400000 0x800000>;
status = "ok";
linux,part-probe = "redboot";
};
target/linux/brcm63xx/image/Makefile
+ 7
− 9
View file @ f36f5784
......@@ -96,12 +96,11 @@ define Image/Build/ZYXCFEDTB
rm -f $(BIN_DIR)/openwrt-$(5)-$(1).tmp
endef
define Image/Build/RedBoot
cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(1)-vmlinux.elf
gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/openwrt-$(1)-vmlinux.lzma bs=65536 conv=sync
dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(1)-vmlinux.gz bs=65536 conv=sync
define Image/Build/RedBootDTB
gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gz
$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.l7
dd if=$(KDIR)/vmlinux-$(2).bin.l7 of=$(BIN_DIR)/openwrt-$(5)-vmlinux.lzma bs=65536 conv=sync
dd if=$(KDIR)/vmlinux-$(2).bin.gz of=$(BIN_DIR)/openwrt-$(5)-vmlinux.gz bs=65536 conv=sync
endef
define Image/Build/HCS
......@@ -201,9 +200,6 @@ define Image/Build
# RTA1320_16M (numerous routers)
$(call Image/Build/CFE,$(1),RTA1320_16M,6338,RTA1320_16M,,--layoutver 5)
# Inventel Livebox
$(call Image/Build/RedBoot,livebox)
# Netgear CVG834G
$(call Image/Build/HCS,$(1),cvg834g,a020,0001,0022,$(KDIR)/vmlinux)
......@@ -297,6 +293,8 @@ $(eval $(call ImageDTB,CFEDTB,HG553,hg553,HW553,6358,HG553,--rsa-signature "Echo
$(eval $(call ImageDTB,CFEDTB,HG556a_AB,hg556a-a,HW556,6358,HG556a_A,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x10000 --tag-version 8))
$(eval $(call ImageDTB,CFEDTB,HG556a_AB,hg556a-b,HW556,6358,HG556a_B,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8))
$(eval $(call ImageDTB,CFEDTB,HG556a_C,hg556a-c,HW556,6358,HG556a_C,--rsa-signature "EchoLife_HG556a" --image-offset 0x20000 --block-size 0x20000 --tag-version 8))
# Inventel Livebox 1
$(eval $(call ImageDTB,RedBootDTB,Livebox,livebox-blue-5g,,,livebox))
# Netgear DG834GT/PN
$(eval $(call ImageDTB,CFEDTB,DG834GTPN,dg834gtpn,96348GW-10,6348,DG834GT_PN))
# Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
......
target/linux/brcm63xx/patches-3.14/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
+ 41
− 26
View file @ f36f5784
From 7e6b22225e16fbb22dbf7f2113d8c6d65333818c Mon Sep 17 00:00:00 2001
From e796582b499f0ba6acaa1ac3a10c09cceaab7702 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 9 Mar 2014 04:55:52 +0100
Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
---
arch/mips/bcm63xx/boards/Kconfig | 6 +
arch/mips/bcm63xx/boards/Makefile | 1 +
arch/mips/bcm63xx/boards/board_common.c | 2 +-
arch/mips/bcm63xx/boards/board_common.h | 6 +
arch/mips/bcm63xx/boards/board_livebox.c | 193 +++++++++++++++++++++++++++++++
5 files changed, 207 insertions(+), 1 deletion(-)
arch/mips/bcm63xx/boards/Kconfig | 6 +
arch/mips/bcm63xx/boards/Makefile | 1 +
arch/mips/bcm63xx/boards/board_common.c | 2 +-
arch/mips/bcm63xx/boards/board_common.h | 6 +
arch/mips/bcm63xx/boards/board_livebox.c | 215 ++++++++++++++++++++++++++++++
5 files changed, 229 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/bcm63xx/boards/board_livebox.c
--- a/arch/mips/bcm63xx/boards/Kconfig
......@@ -57,7 +57,7 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
#endif /* __BOARD_COMMON_H */
--- /dev/null
+++ b/arch/mips/bcm63xx/boards/board_livebox.c
@@ -0,0 +1,200 @@
@@ -0,0 +1,215 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
......@@ -183,6 +183,11 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
+#endif
+};
+
+static struct of_device_id const livebox_boards_dt[] = {
+ { .compatible = "inventel,livebox-blue-5g", .data = &board_livebox_blue5g, },
+ { }
+};
+
+/*
+ * register & return a new board mac address
+ */
......@@ -227,23 +232,33 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
+ u32 val;
+ u8 hw_version;
+ const struct board_info *board;
+
+ /* Get hardware version */
+ val = bcm_gpio_readl(GPIO_CTL_LO_REG);
+ val &= ~LIVEBOX_GPIO_DETECT_MASK;
+ bcm_gpio_writel(val, GPIO_CTL_LO_REG);
+
+ hw_version = bcm_gpio_readl(GPIO_DATA_LO_REG) & LIVEBOX_GPIO_DETECT_MASK;
+ switch (hw_version) {
+ case LIVEBOX_HW_BLUE5G_9:
+ printk(KERN_INFO PFX "Livebox BLUE5G.9\n");
+ board = bcm963xx_boards[0];
+ break;
+ default:
+ printk(KERN_INFO PFX "Unknown livebox version: %02x\n", hw_version);
+ /* use default livebox configuration */
+ board = bcm963xx_boards[0];
+ break;
+ const struct of_device_id *board_match;
+
+ /* find board by compat */
+ board_match = bcm63xx_match_board(livebox_boards_dt);
+ if (board_match) {
+ board = board_match->data;
+ } else {
+ /* Get hardware version */
+ val = bcm_gpio_readl(GPIO_CTL_LO_REG);
+ val &= ~LIVEBOX_GPIO_DETECT_MASK;
+ bcm_gpio_writel(val, GPIO_CTL_LO_REG);
+
+ hw_version = bcm_gpio_readl(GPIO_DATA_LO_REG);
+ hw_version &= LIVEBOX_GPIO_DETECT_MASK;
+
+ switch (hw_version) {
+ case LIVEBOX_HW_BLUE5G_9:
+ printk(KERN_INFO PFX "Livebox BLUE5G.9\n");
+ board = bcm963xx_boards[0];
+ break;
+ default:
+ printk(KERN_INFO PFX "Unknown livebox version: %02x\n",
+ hw_version);
+ /* use default livebox configuration */
+ board = bcm963xx_boards[0];
+ break;
+ }
+ }
+
+ /* use default livebox configuration */
......
target/linux/brcm63xx/patches-3.18/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
+ 41
− 26
View file @ f36f5784
From 7e6b22225e16fbb22dbf7f2113d8c6d65333818c Mon Sep 17 00:00:00 2001
From e796582b499f0ba6acaa1ac3a10c09cceaab7702 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 9 Mar 2014 04:55:52 +0100
Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
---
arch/mips/bcm63xx/boards/Kconfig | 6 +
arch/mips/bcm63xx/boards/Makefile | 1 +
arch/mips/bcm63xx/boards/board_common.c | 2 +-
arch/mips/bcm63xx/boards/board_common.h | 6 +
arch/mips/bcm63xx/boards/board_livebox.c | 193 +++++++++++++++++++++++++++++++
5 files changed, 207 insertions(+), 1 deletion(-)
arch/mips/bcm63xx/boards/Kconfig | 6 +
arch/mips/bcm63xx/boards/Makefile | 1 +
arch/mips/bcm63xx/boards/board_common.c | 2 +-
arch/mips/bcm63xx/boards/board_common.h | 6 +
arch/mips/bcm63xx/boards/board_livebox.c | 215 ++++++++++++++++++++++++++++++
5 files changed, 229 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/bcm63xx/boards/board_livebox.c
--- a/arch/mips/bcm63xx/boards/Kconfig
......@@ -57,7 +57,7 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
#endif /* __BOARD_COMMON_H */
--- /dev/null
+++ b/arch/mips/bcm63xx/boards/board_livebox.c
@@ -0,0 +1,200 @@
@@ -0,0 +1,215 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
......@@ -183,6 +183,11 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
+#endif
+};
+
+static struct of_device_id const livebox_boards_dt[] = {
+ { .compatible = "inventel,livebox-blue-5g", .data = &board_livebox_blue5g, },
+ { }
+};
+
+/*
+ * register & return a new board mac address
+ */
......@@ -227,23 +232,33 @@ Subject: [PATCH 44/44] MIPS: BCM63XX: add inventel Livebox support
+ u32 val;
+ u8 hw_version;
+ const struct board_info *board;
+
+ /* Get hardware version */
+ val = bcm_gpio_readl(GPIO_CTL_LO_REG);
+ val &= ~LIVEBOX_GPIO_DETECT_MASK;
+ bcm_gpio_writel(val, GPIO_CTL_LO_REG);
+
+ hw_version = bcm_gpio_readl(GPIO_DATA_LO_REG) & LIVEBOX_GPIO_DETECT_MASK;
+ switch (hw_version) {
+ case LIVEBOX_HW_BLUE5G_9:
+ printk(KERN_INFO PFX "Livebox BLUE5G.9\n");
+ board = bcm963xx_boards[0];
+ break;
+ default:
+ printk(KERN_INFO PFX "Unknown livebox version: %02x\n", hw_version);
+ /* use default livebox configuration */
+ board = bcm963xx_boards[0];
+ break;
+ const struct of_device_id *board_match;
+
+ /* find board by compat */
+ board_match = bcm63xx_match_board(livebox_boards_dt);
+ if (board_match) {
+ board = board_match->data;
+ } else {
+ /* Get hardware version */
+ val = bcm_gpio_readl(GPIO_CTL_LO_REG);
+ val &= ~LIVEBOX_GPIO_DETECT_MASK;
+ bcm_gpio_writel(val, GPIO_CTL_LO_REG);
+
+ hw_version = bcm_gpio_readl(GPIO_DATA_LO_REG);
+ hw_version &= LIVEBOX_GPIO_DETECT_MASK;
+
+ switch (hw_version) {
+ case LIVEBOX_HW_BLUE5G_9:
+ printk(KERN_INFO PFX "Livebox BLUE5G.9\n");
+ board = bcm963xx_boards[0];
+ break;
+ default:
+ printk(KERN_INFO PFX "Unknown livebox version: %02x\n",
+ hw_version);
+ /* use default livebox configuration */
+ board = bcm963xx_boards[0];
+ break;
+ }
+ }
+
+ /* use default livebox configuration */
......
target/linux/brcm63xx/profiles/inventel.mk 0 → 100644
+ 15
− 0
View file @ f36f5784
#
# Copyright (C) 2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Profile/Livebox
NAME:=Inventel Livebox 1
PACKAGES:=kmod-b43 wpad-mini kmod-usb-ohci
endef
define Profile/Livebox/Description
Package set optimized for Inventel Livebox 1.
endef
$(eval $(call Profile,Livebox))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment