Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
commit
a5f3f0de07
@ -16,6 +16,10 @@ aerohive,hiveap-330|\
|
||||
enterasys,ws-ap3715i)
|
||||
ucidef_set_interfaces_lan_wan "eth1" "eth0"
|
||||
;;
|
||||
enterasys,ws-ap3710i)
|
||||
ucidef_set_interface_lan "eth0"
|
||||
ucidef_set_label_macaddr "$(mtd_get_mac_ascii cfg1 ethaddr)"
|
||||
;;
|
||||
hpe,msm460)
|
||||
ucidef_set_interface_lan "eth0"
|
||||
;;
|
||||
|
||||
@ -3,6 +3,9 @@
|
||||
|
||||
preinit_set_mac_address() {
|
||||
case $(board_name) in
|
||||
enterasys,ws-ap3710i)
|
||||
ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
|
||||
;;
|
||||
enterasys,ws-ap3715i|\
|
||||
extreme-networks,ws-ap3825i)
|
||||
ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
led-failsafe = &led_power_red;
|
||||
led-running = &led_power_green;
|
||||
led-upgrade = &led_power_red;
|
||||
label-mac-device = &enet0;
|
||||
};
|
||||
|
||||
chosen {
|
||||
|
||||
@ -63,8 +63,8 @@ define Device/enterasys_ws-ap3710i
|
||||
DEVICE_MODEL := WS-AP3710i
|
||||
BLOCKSIZE := 128k
|
||||
KERNEL_NAME := simpleImage.ws-ap3710i
|
||||
KERNEL_ENTRY := 0x1000000
|
||||
KERNEL_LOADADDR := 0x1000000
|
||||
KERNEL_ENTRY := 0x1500000
|
||||
KERNEL_LOADADDR := 0x1500000
|
||||
KERNEL = kernel-bin | uImage none
|
||||
KERNEL_INITRAMFS := kernel-bin | uImage none
|
||||
IMAGES := sysupgrade.bin
|
||||
|
||||
@ -48,13 +48,15 @@
|
||||
|
||||
--- a/arch/powerpc/boot/wrapper
|
||||
+++ b/arch/powerpc/boot/wrapper
|
||||
@@ -326,7 +326,8 @@ adder875-redboot)
|
||||
platformo="$object/fixed-head.o $object/redboot-8xx.o"
|
||||
binary=y
|
||||
;;
|
||||
-simpleboot-tl-wdr4900-v1)
|
||||
+simpleboot-tl-wdr4900-v1|\
|
||||
+simpleboot-ws-ap3710i)
|
||||
platformo="$object/fixed-head.o $object/simpleboot.o"
|
||||
@@ -331,6 +331,11 @@ simpleboot-tl-wdr4900-v1)
|
||||
link_address='0x1000000'
|
||||
binary=y
|
||||
;;
|
||||
+simpleboot-ws-ap3710i)
|
||||
+ platformo="$object/fixed-head.o $object/simpleboot.o"
|
||||
+ link_address='0x1500000'
|
||||
+ binary=y
|
||||
+ ;;
|
||||
simpleboot-*)
|
||||
platformo="$object/fixed-head.o $object/simpleboot.o"
|
||||
binary=y
|
||||
|
||||
@ -47,12 +47,12 @@ WS-AP3825i AP.
|
||||
|
||||
--- a/arch/powerpc/boot/wrapper
|
||||
+++ b/arch/powerpc/boot/wrapper
|
||||
@@ -327,7 +327,8 @@ adder875-redboot)
|
||||
@@ -326,7 +326,8 @@ adder875-redboot)
|
||||
platformo="$object/fixed-head.o $object/redboot-8xx.o"
|
||||
binary=y
|
||||
;;
|
||||
simpleboot-tl-wdr4900-v1|\
|
||||
-simpleboot-ws-ap3710i)
|
||||
+simpleboot-ws-ap3710i|\
|
||||
-simpleboot-tl-wdr4900-v1)
|
||||
+simpleboot-tl-wdr4900-v1|\
|
||||
+simpleboot-ws-ap3825i)
|
||||
platformo="$object/fixed-head.o $object/simpleboot.o"
|
||||
link_address='0x1000000'
|
||||
|
||||
@ -40,10 +40,10 @@
|
||||
image-$(CONFIG_MVME7100) += dtbImage.mvme7100
|
||||
--- a/arch/powerpc/boot/wrapper
|
||||
+++ b/arch/powerpc/boot/wrapper
|
||||
@@ -328,6 +328,7 @@ adder875-redboot)
|
||||
@@ -327,6 +327,7 @@ adder875-redboot)
|
||||
binary=y
|
||||
;;
|
||||
simpleboot-tl-wdr4900-v1|\
|
||||
simpleboot-ws-ap3710i|\
|
||||
+simpleboot-ws-ap3715i|\
|
||||
simpleboot-ws-ap3825i)
|
||||
platformo="$object/fixed-head.o $object/simpleboot.o"
|
||||
|
||||
@ -53,5 +53,5 @@
|
||||
;;
|
||||
+simpleboot-br200-wp|\
|
||||
simpleboot-tl-wdr4900-v1|\
|
||||
simpleboot-ws-ap3710i|\
|
||||
simpleboot-ws-ap3715i|\
|
||||
simpleboot-ws-ap3825i)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/arch/powerpc/platforms/85xx/Kconfig
|
||||
+++ b/arch/powerpc/platforms/85xx/Kconfig
|
||||
@@ -114,6 +114,17 @@ config FIREBOX_T10
|
||||
@@ -123,6 +123,17 @@ config FIREBOX_T10
|
||||
This board is a VPN Gateway-Router with a
|
||||
Freescale P1010 SoC.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user