From 521ca2dfd78a99a232a53a50bd2f9efaa8a226bc Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 20 Oct 2017 01:41:04 +0800 Subject: [PATCH 1/2] fix DW33D kernel part too big in 4.9 --- .../ar71xx/base-files/etc/board.d/01_leds | 16 +- .../ar71xx/base-files/etc/board.d/02_network | 3 + .../base-files/etc/board.d/03_gpio_switches | 3 + target/linux/ar71xx/base-files/etc/diag.sh | 8 + .../etc/hotplug.d/firmware/11-ath10k-caldata | 4 + target/linux/ar71xx/base-files/lib/ar71xx.sh | 9 + .../ar71xx/base-files/lib/upgrade/platform.sh | 22 ++ target/linux/ar71xx/config-4.4 | 1 + target/linux/ar71xx/config-4.9 | 2 +- .../files/arch/mips/ath79/Kconfig.openwrt | 13 + .../ar71xx/files/arch/mips/ath79/Makefile | 2 + .../files/arch/mips/ath79/mach-archer-c7-v4.c | 260 ++++++++++++++++++ .../ar71xx/files/arch/mips/ath79/mach-rbspi.c | 8 +- .../files/arch/mips/ath79/mach-wi2a-ac200i.c | 217 +++++++++++++++ .../ar71xx/files/arch/mips/ath79/machtypes.h | 2 + .../net/ethernet/atheros/ag71xx/ag71xx_main.c | 6 +- target/linux/ar71xx/image/mikrotik.mk | 2 +- target/linux/ar71xx/image/nand.mk | 19 +- target/linux/ar71xx/image/tp-link.mk | 15 +- target/linux/ar71xx/nand/config-default | 1 + tools/firmware-utils/src/tplink-safeloader.c | 46 ++++ 21 files changed, 649 insertions(+), 10 deletions(-) create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c create mode 100644 target/linux/ar71xx/files/arch/mips/ath79/mach-wi2a-ac200i.c diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds index 51d21ca91..27e6c8a03 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -58,7 +58,8 @@ sc1750|\ sc450) ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt" ;; -archer-c25-v1) +archer-c25-v1|\ +archer-c7-v4) ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0" ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt" ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt" @@ -66,6 +67,12 @@ archer-c25-v1) ucidef_set_led_switch "lan2" "LAN2" "$board:green:lan2" "switch0" "0x08" ucidef_set_led_switch "lan3" "LAN3" "$board:green:lan3" "switch0" "0x04" ucidef_set_led_switch "lan4" "LAN4" "$board:green:lan4" "switch0" "0x02" + case "$board" in + archer-c7-v4) + ucidef_set_led_usbdev "usb1" "USB1" "$board:green:usb1" "1-1" + ucidef_set_led_usbdev "usb2" "USB2" "$board:green:usb2" "2-1" + ;; + esac ;; archer-c58-v1|\ archer-c59-v1|\ @@ -267,6 +274,7 @@ rb-750) ucidef_set_led_switch "port5" "port5" "rb750:green:port5" "switch0" "0x02" ;; rb-750-r2|\ +rb-750p-pbr2|\ rb-750up-r2) ucidef_set_led_timer "user" "USER" "rb:green:user" "1000" "1000" ucidef_set_led_netdev "port1" "port1" "rb:green:port1" "eth0" @@ -823,6 +831,12 @@ r6100) ucidef_set_led_usbdev "usb" "USB" "netgear:blue:usb" "1-1" ucidef_set_led_wlan "wlan" "WLAN" "netgear:blue:wlan" "phy1tpt" ;; +wi2a-ac200i) + ucidef_set_led_default "power" "Power (green)" "nokia:green:power" "1" + ucidef_set_led_default "wan" "Ethernet LED (green)" "nokia:green:wan" "1" + ucidef_set_led_wlan "wlan5g" "WLAN" "nokia:green:wlan-5g" "phy0tpt" + ucidef_set_led_wlan "wlan2g" "WLAN" "nokia:green:wlan-2g" "phy1tpt" + ;; wndr3700v4|\ wndr4300) ucidef_set_led_switch "wan-green" "WAN (green)" "netgear:green:wan" "switch0" "0x20" "0x08" diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 39e819fd3..a75f5fe29 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -128,6 +128,7 @@ ar71xx_setup_interfaces() tl-wr902ac-v1|\ tube2h|\ unifiac-lite|\ + wi2a-ac200i|\ wndap360|\ wp543) ucidef_set_interface_lan "eth0" @@ -160,6 +161,7 @@ ar71xx_setup_interfaces() ucidef_set_interfaces_lan_wan "eth1" "eth0" ;; rb-750-r2|\ + rb-750p-pbr2|\ rb-750up-r2) ucidef_set_interfaces_lan_wan "eth1.1" "eth0" ucidef_add_switch "switch0" \ @@ -426,6 +428,7 @@ ar71xx_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth1" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3" ;; + archer-c7-v4|\ tl-wdr4300|\ tl-wr1041n-v2) ucidef_add_switch "switch0" \ diff --git a/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches index add7e47e8..360a45f69 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ar71xx/base-files/etc/board.d/03_gpio_switches @@ -32,6 +32,9 @@ rb-952ui-5ac2nd) ucidef_add_gpio_switch "usb_power_switch" "USB Power Switch" "45" "1" ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "14" ;; +rb-750p-pbr2) + ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "14" + ;; esac board_config_flush diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 6794d8911..f4ad435ea 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -58,6 +58,7 @@ get_status_led() { archer-c58-v1|\ archer-c59-v1|\ archer-c60-v1|\ + archer-c7-v4|\ fritz300e|\ gl-usb150|\ mr12|\ @@ -316,6 +317,7 @@ get_status_led() { status_led="rb750:green:act" ;; rb-750-r2|\ + rb-750p-pbr2|\ rb-750up-r2|\ rb-911g-2hpnd|\ rb-911g-5hpacd|\ @@ -458,6 +460,9 @@ get_status_led() { airgatewaypro) status_led="ubnt:white:status" ;; + wi2a-ac200i) + status_led="nokia:green:ctrl" + ;; whr-g301n|\ whr-hp-g300n|\ whr-hp-gn|\ @@ -528,6 +533,9 @@ set_state() { local n=$(fw_printenv activeregion | cut -d = -f 2) fw_setenv "image${n}trynum" 0 ;; + wi2a-ac200i) + fw_setenv PKRstCnt 0 + ;; esac ;; esac diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 85a2a6302..66796593c 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -54,6 +54,7 @@ case "$FIRMWARE" in ath10kcal_extract "ART" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; + archer-c7-v4|\ archer-c25-v1|\ archer-c59-v1|\ archer-c60-v1|\ @@ -111,6 +112,9 @@ case "$FIRMWARE" in unifiac-pro) ath10kcal_extract "EEPROM" 20480 2116 ;; + wi2a-ac200i) + ath10kcal_extract "ART" 20480 2116 + ;; esac ;; "ath10k/cal-pci-0000:01:00.0.bin") diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 0bd96c065..f89c0098e 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -452,6 +452,9 @@ ar71xx_board_detect() { *"Archer C5") name="archer-c5" ;; + *"Archer C7 v4") + name="archer-c7-v4" + ;; *"Archer C58 v1") name="archer-c58-v1" ;; @@ -911,6 +914,9 @@ ar71xx_board_detect() { *"RouterBOARD 750GL") name="rb-750gl" ;; + *"RouterBOARD 750P r2") + name="rb-750p-pbr2" + ;; *"RouterBOARD 750UP r2") name="rb-750up-r2" ;; @@ -1228,6 +1234,9 @@ ar71xx_board_detect() { "WeIO"*) name="weio" ;; + *"WI2A-AC200i") + name="wi2a-ac200i" + ;; *"WHR-G301N") name="whr-g301n" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 65d90d400..3d6d9ed57 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -211,6 +211,7 @@ platform_check_image() { archer-c58-v1|\ archer-c59-v1|\ archer-c60-v1|\ + archer-c7-v4|\ bullet-m|\ c-55|\ carambola2|\ @@ -534,6 +535,7 @@ platform_check_image() { nbg6716|\ r6100|\ rambutan|\ + wi2a-ac200i|\ wndr3700v4|\ wndr4300) nand_do_platform_check $board $1 @@ -655,6 +657,7 @@ platform_check_image() { # these boards use metadata images fritz300e|\ rb-750-r2|\ + rb-750p-pbr2|\ rb-750up-r2|\ rb-941-2nd|\ rb-951ui-2nd|\ @@ -707,11 +710,13 @@ platform_pre_upgrade() { rb-2011uias-2hnd|\ rb-sxt2n|\ rb-sxt5n|\ + wi2a-ac200i|\ wndr3700v4|\ wndr4300) nand_do_upgrade "$1" ;; rb-750-r2|\ + rb-750p-pbr2|\ rb-750up-r2|\ rb-941-2nd|\ rb-951ui-2nd|\ @@ -741,6 +746,23 @@ platform_nand_pre_upgrade() { mtd erase kernel tar xf "$1" sysupgrade-routerboard/kernel -O | nandwrite -o "$fw_mtd" - ;; + wi2a-ac200i) + case "$(fw_printenv -n dualPartition)" in + imgA) + fw_setenv dualPartition imgB + fw_setenv ActImg NokiaImageB + ;; + imgB) + fw_setenv dualPartition imgA + fw_setenv ActImg NokiaImageA + ;; + esac + ubiblock -r /dev/ubiblock0_0 2>/dev/null >/dev/null + rm -f /dev/ubiblock0_0 + ubidetach -d 0 2>/dev/null >/dev/null + CI_UBIPART=ubi_alt + CI_KERNPART=kernel_alt + ;; esac } diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 0e7756041..4793bf4de 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -223,6 +223,7 @@ CONFIG_ATH79_MACH_UBNT=y CONFIG_ATH79_MACH_UBNT_UNIFIAC=y CONFIG_ATH79_MACH_UBNT_XM=y CONFIG_ATH79_MACH_WEIO=y +# CONFIG_ATH79_MACH_WI2A_AC200I is not set CONFIG_ATH79_MACH_WHR_HP_G300N=y CONFIG_ATH79_MACH_WLAE_AG300N=y CONFIG_ATH79_MACH_WLR8100=y diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9 index 0bd20e7b6..84b2a0b72 100644 --- a/target/linux/ar71xx/config-4.9 +++ b/target/linux/ar71xx/config-4.9 @@ -221,6 +221,7 @@ CONFIG_ATH79_MACH_UBNT=y CONFIG_ATH79_MACH_UBNT_UNIFIAC=y CONFIG_ATH79_MACH_UBNT_XM=y CONFIG_ATH79_MACH_WEIO=y +# CONFIG_ATH79_MACH_WI2A_AC200I is not set CONFIG_ATH79_MACH_WHR_HP_G300N=y CONFIG_ATH79_MACH_WLAE_AG300N=y CONFIG_ATH79_MACH_WLR8100=y @@ -378,7 +379,6 @@ CONFIG_MIPS_CLOCK_VSYSCALL=y CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y # CONFIG_MIPS_CMDLINE_FROM_DTB is not set # CONFIG_MIPS_ELF_APPENDED_DTB is not set -CONFIG_MIPS_FPU_EMULATOR=y # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set CONFIG_MIPS_L1_CACHE_SHIFT=5 CONFIG_MIPS_MACHINE=y diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt index 173de346f..5cb4f7ed3 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt +++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt @@ -8,6 +8,17 @@ config ATH79_MACH_A60 select ATH79_DEV_WMAC select ATH79_DEV_USB +config ATH79_MACH_WI2A_AC200I + bool "Nokia WI2A-AC200i support" + select SOC_QCA955X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 + select ATH79_DEV_NFC + select ATH79_DEV_WMAC + select ATH79_DEV_USB + config ATH79_MACH_ALFA_AP120C bool "ALFA Network AP120C board support" select ATH79_DEV_AP9X_PCI if PCI @@ -1008,6 +1019,7 @@ config ATH79_MACH_RBSPI MikroTik RouterBOARD hAP ac lite MikroTik RouterBOARD hEX PoE lite MikroTik RouterBOARD hEX lite + MikroTik RouterBOARD Powerbox MikroTik RouterBOARD LHG 5 MikroTik RouterBOARD cAP (EXPERIMENTAL) MikroTik RouterBOARD mAP (EXPERIMENTAL) @@ -1381,6 +1393,7 @@ config ATH79_MACH_ARCHER_C60_V1 config ATH79_MACH_ARCHER_C7 bool "TP-LINK Archer C5/C7/TL-WDR4900 v2 board support" select SOC_QCA955X + select SOC_QCA956X select ATH79_DEV_AP9X_PCI if PCI select ATH79_DEV_ETH select ATH79_DEV_GPIO_BUTTONS diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Makefile b/target/linux/ar71xx/files/arch/mips/ath79/Makefile index 0975aac8b..7d12282ba 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/Makefile +++ b/target/linux/ar71xx/files/arch/mips/ath79/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += routerboot.o # Machines # obj-$(CONFIG_ATH79_MACH_A60) += mach-a60.o +obj-$(CONFIG_ATH79_MACH_WI2A_AC200I) += mach-wi2a-ac200i.o obj-$(CONFIG_ATH79_MACH_ALFA_AP120C) += mach-alfa-ap120c.o obj-$(CONFIG_ATH79_MACH_ALFA_AP96) += mach-alfa-ap96.o obj-$(CONFIG_ATH79_MACH_ALFA_NX) += mach-alfa-nx.o @@ -62,6 +63,7 @@ obj-$(CONFIG_ATH79_MACH_ARCHER_C58_V1) += mach-archer-c59-v1.o obj-$(CONFIG_ATH79_MACH_ARCHER_C59_V1) += mach-archer-c59-v1.o obj-$(CONFIG_ATH79_MACH_ARCHER_C60_V1) += mach-archer-c60-v1.o obj-$(CONFIG_ATH79_MACH_ARCHER_C7) += mach-archer-c7.o +obj-$(CONFIG_ATH79_MACH_ARCHER_C7) += mach-archer-c7-v4.o obj-$(CONFIG_ATH79_MACH_ARDUINO_YUN) += mach-arduino-yun.o obj-$(CONFIG_ATH79_MACH_AW_NR580) += mach-aw-nr580.o obj-$(CONFIG_ATH79_MACH_BHR_4GRV2) += mach-bhr-4grv2.o diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c new file mode 100644 index 000000000..64955c799 --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c @@ -0,0 +1,260 @@ + +/* + * Atheros ARCHER_C7 reference board support + * + * Copyright (c) 2017 Felix Fietkau + * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2012 Gabor Juhos + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "common.h" +#include "dev-m25p80.h" +#include "machtypes.h" +#include "pci.h" +#include "dev-eth.h" +#include "dev-gpio-buttons.h" +#include "dev-leds-gpio.h" +#include "dev-spi.h" +#include "dev-usb.h" +#include "dev-wmac.h" + + +#define ARCHER_C7_GPIO_SHIFT_OE 1 +#define ARCHER_C7_GPIO_SHIFT_SER 14 +#define ARCHER_C7_GPIO_SHIFT_SRCLK 15 +#define ARCHER_C7_GPIO_SHIFT_RCLK 16 +#define ARCHER_C7_GPIO_SHIFT_SRCLR 21 + +#define ARCHER_C7_GPIO_BTN_RESET 5 +#define ARCHER_C7_GPIO_BTN_WPS_WIFI 2 + +#define ARCHER_C7_GPIO_LED_WLAN5 9 +#define ARCHER_C7_GPIO_LED_POWER 6 +#define ARCHER_C7_GPIO_LED_USB1 7 +#define ARCHER_C7_GPIO_LED_USB2 8 + +#define ARCHER_C7_74HC_GPIO_BASE QCA956X_GPIO_COUNT +#define ARCHER_C7_GPIO_LED_WPS (ARCHER_C7_74HC_GPIO_BASE + 0) +#define ARCHER_C7_GPIO_LED_LAN1 (ARCHER_C7_74HC_GPIO_BASE + 1) +#define ARCHER_C7_GPIO_LED_LAN2 (ARCHER_C7_74HC_GPIO_BASE + 2) +#define ARCHER_C7_GPIO_LED_LAN3 (ARCHER_C7_74HC_GPIO_BASE + 3) +#define ARCHER_C7_GPIO_LED_LAN4 (ARCHER_C7_74HC_GPIO_BASE + 4) +#define ARCHER_C7_GPIO_LED_WAN_GREEN (ARCHER_C7_74HC_GPIO_BASE + 5) +#define ARCHER_C7_GPIO_LED_WAN_AMBER (ARCHER_C7_74HC_GPIO_BASE + 6) +#define ARCHER_C7_GPIO_LED_WLAN2 (ARCHER_C7_74HC_GPIO_BASE + 7) + +#define ARCHER_C7_KEYS_POLL_INTERVAL 20 /* msecs */ +#define ARCHER_C7_KEYS_DEBOUNCE_INTERVAL (3 * ARCHER_C7_KEYS_POLL_INTERVAL) + +#define ARCHER_C7_MAC0_OFFSET 0 +#define ARCHER_C7_MAC1_OFFSET 6 +#define ARCHER_C7_WMAC_CALDATA_OFFSET 0x1000 + +#define ARCHER_C7_GPIO_MDC 3 +#define ARCHER_C7_GPIO_MDIO 4 + +static struct spi_gpio_platform_data archer_c7_v4_spi_data = { + .sck = ARCHER_C7_GPIO_SHIFT_SRCLK, + .miso = SPI_GPIO_NO_MISO, + .mosi = ARCHER_C7_GPIO_SHIFT_SER, + .num_chipselect = 1, +}; + +static u8 archer_c7_v4_ssr_initdata __initdata = 0xff; + +static struct gen_74x164_chip_platform_data archer_c7_v4_ssr_data = { + .base = ARCHER_C7_74HC_GPIO_BASE, + .num_registers = 1, + .init_data = &archer_c7_v4_ssr_initdata, +}; + +static struct platform_device archer_c7_v4_spi_device = { + .name = "spi_gpio", + .id = 1, + .dev = { + .platform_data = &archer_c7_v4_spi_data, + }, +}; + +static struct spi_board_info archer_c7_v4_spi_info[] = { + { + .bus_num = 1, + .chip_select = 0, + .max_speed_hz = 10000000, + .modalias = "74x164", + .platform_data = &archer_c7_v4_ssr_data, + .controller_data = (void *) ARCHER_C7_GPIO_SHIFT_RCLK, + }, +}; + +static struct gpio_led archer_c7_v4_leds_gpio[] __initdata = { + { + .name = "archer-c7-v4:green:power", + .gpio = ARCHER_C7_GPIO_LED_POWER, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wps", + .gpio = ARCHER_C7_GPIO_LED_WPS, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wlan2g", + .gpio = ARCHER_C7_GPIO_LED_WLAN2, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wlan5g", + .gpio = ARCHER_C7_GPIO_LED_WLAN5, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan1", + .gpio = ARCHER_C7_GPIO_LED_LAN1, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan2", + .gpio = ARCHER_C7_GPIO_LED_LAN2, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan3", + .gpio = ARCHER_C7_GPIO_LED_LAN3, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:lan4", + .gpio = ARCHER_C7_GPIO_LED_LAN4, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:wan", + .gpio = ARCHER_C7_GPIO_LED_WAN_GREEN, + .active_low = 1, + }, { + .name = "archer-c7-v4:amber:wan", + .gpio = ARCHER_C7_GPIO_LED_WAN_AMBER, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:usb1", + .gpio = ARCHER_C7_GPIO_LED_USB1, + .active_low = 1, + }, { + .name = "archer-c7-v4:green:usb2", + .gpio = ARCHER_C7_GPIO_LED_USB2, + .active_low = 1, + }, +}; + +static struct gpio_keys_button archer_c7_v4_gpio_keys[] __initdata = { + { + .desc = "WPS and WIFI button", + .type = EV_KEY, + .code = KEY_WPS_BUTTON, + .debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL, + .gpio = ARCHER_C7_GPIO_BTN_WPS_WIFI, + .active_low = 1, + }, + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = ARCHER_C7_KEYS_DEBOUNCE_INTERVAL, + .gpio = ARCHER_C7_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static struct ar8327_pad_cfg archer_c7_v4_ar8337_pad0_cfg = { + .mode = AR8327_PAD_MAC_SGMII, + .sgmii_delay_en = true, +}; + +static struct ar8327_platform_data archer_c7_v4_ar8337_data = { + .pad0_cfg = &archer_c7_v4_ar8337_pad0_cfg, + .port0_cfg = { + .force_link = 1, + .speed = AR8327_PORT_SPEED_1000, + .duplex = 1, + .txpause = 1, + .rxpause = 1, + }, +}; + +static struct mdio_board_info archer_c7_v4_mdio0_info[] = { + { + .bus_id = "ag71xx-mdio.0", + .phy_addr = 0, + .platform_data = &archer_c7_v4_ar8337_data, + }, +}; + + +static void __init archer_c7_v4_setup(void) +{ + u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); + u8 *mac = (u8 *) KSEG1ADDR(0x1ff00008); + + ath79_register_m25p80(NULL); + + spi_register_board_info(archer_c7_v4_spi_info, + ARRAY_SIZE(archer_c7_v4_spi_info)); + + platform_device_register(&archer_c7_v4_spi_device); + + gpio_request_one(ARCHER_C7_GPIO_SHIFT_OE, + GPIOF_OUT_INIT_LOW | GPIOF_EXPORT_DIR_FIXED, + "LED control"); + + gpio_request_one(ARCHER_C7_GPIO_SHIFT_SRCLR, + GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED, + "LED reset"); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(archer_c7_v4_leds_gpio), + archer_c7_v4_leds_gpio); + + ath79_register_gpio_keys_polled(-1, ARCHER_C7_KEYS_POLL_INTERVAL, + ARRAY_SIZE(archer_c7_v4_gpio_keys), + archer_c7_v4_gpio_keys); + + ath79_register_usb(); + + ath79_gpio_output_select(ARCHER_C7_GPIO_MDC, QCA956X_GPIO_OUT_MUX_GE0_MDC); + ath79_gpio_output_select(ARCHER_C7_GPIO_MDIO, QCA956X_GPIO_OUT_MUX_GE0_MDO); + + ath79_register_mdio(0, 0x0); + + mdiobus_register_board_info(archer_c7_v4_mdio0_info, + ARRAY_SIZE(archer_c7_v4_mdio0_info)); + + ath79_register_wmac(art + ARCHER_C7_WMAC_CALDATA_OFFSET, mac); + ath79_register_pci(); + + /* GMAC0 is connected to an AR8337 switch */ + ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0); + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth0_data.speed = SPEED_1000; + ath79_eth0_data.duplex = DUPLEX_FULL; + ath79_eth0_data.phy_mask = BIT(0); + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_register_eth(0); +} + +MIPS_MACHINE(ATH79_MACH_ARCHER_C7_V4, "ARCHER-C7-V4", "TP-LINK Archer C7 v4", + archer_c7_v4_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c index 58e3138b5..4cdc171de 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c @@ -7,6 +7,7 @@ * - MikroTik RouterBOARD 952Ui-5ac2nD * - MikroTik RouterBOARD 962UiGS-5HacT2HnT * - MikroTik RouterBOARD 750UP r2 + * - MikroTik RouterBOARD 750P-PBr2 * - MikroTik RouterBOARD 750 r2 * - MikroTik RouterBOARD LHG 5nD * @@ -763,7 +764,8 @@ static void __init rb952_setup(void) * Init the hEX (PoE) lite hardware (QCA953x). * The 750UP r2 (hEX PoE lite) is nearly identical to the hAP, only without * WLAN. The 750 r2 (hEX lite) is nearly identical to the 750UP r2, only - * without USB and POE. It shares the same bootloader board identifier. + * without USB and POE. The 750P Pbr2 (Powerbox) is nearly identical to hEX PoE + * lite, only without USB. It shares the same bootloader board identifier. */ static void __init rb750upr2_setup(void) { @@ -776,6 +778,10 @@ static void __init rb750upr2_setup(void) if (strstr(mips_get_machine_name(), "750UP r2")) flags |= RBSPI_HAS_USB | RBSPI_HAS_POE; + /* differentiate the Powerbox from the hEX lite */ + else if (strstr(mips_get_machine_name(), "750P r2")) + flags |= RBSPI_HAS_POE; + rbspi_952_750r2_setup(flags); } diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wi2a-ac200i.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wi2a-ac200i.c new file mode 100644 index 000000000..85e0c8fea --- /dev/null +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wi2a-ac200i.c @@ -0,0 +1,217 @@ +/* + * Nokia WI2A-AC200i support + * + * Copyright (c) 2012 Qualcomm Atheros + * Copyright (c) 2012-2013 Gabor Juhos + * Copyright (c) 2017 Felix Fietkau + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include +#include +#include +#include + +#include +#include + +#include "common.h" +#include "pci.h" +#include "dev-ap9x-pci.h" +#include "dev-gpio-buttons.h" +#include "dev-eth.h" +#include "dev-leds-gpio.h" +#include "dev-m25p80.h" +#include "dev-nfc.h" +#include "dev-usb.h" +#include "dev-wmac.h" +#include "machtypes.h" + +#define AC200I_GPIO_BTN_RESET 17 + +#define AC200I_KEYS_POLL_INTERVAL 20 /* msecs */ +#define AC200I_KEYS_DEBOUNCE_INTERVAL (3 * AC200I_KEYS_POLL_INTERVAL) + +#define AC200I_MAC_ADDR 0x1f040249 +#define AC200I_MAC1_OFFSET 6 +#define AC200I_WMAC_CALDATA_ADDR 0x1f061000 + +static struct gpio_led ac200i_leds_gpio[] __initdata = { + { + .name = "nokia:red:wlan-2g", + .gpio = 0, + .active_low = 1, + }, + { + .name = "nokia:green:power", + .gpio = 1, + .active_low = 1, + }, + { + .name = "nokia:green:wlan-2g", + .gpio = 2, + .active_low = 1, + }, + { + .name = "nokia:green:ctrl", + .gpio = 3, + .active_low = 1, + }, + { + .name = "nokia:green:eth", + .gpio = 4, + .active_low = 1, + }, + { + .name = "nokia:red:power", + .gpio = 13, + .active_low = 1, + }, + { + .name = "nokia:red:eth", + .gpio = 14, + .active_low = 1, + }, + { + .name = "nokia:red:wlan-5g", + .gpio = 18, + .active_low = 1, + }, + { + .name = "nokia:green:wlan-5g", + .gpio = 19, + .active_low = 1, + }, + { + .name = "nokia:red:ctrl", + .gpio = 20, + .active_low = 1, + }, +}; + +static struct gpio_keys_button ac200i_gpio_keys[] __initdata = { + { + .desc = "Reset button", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = AC200I_KEYS_DEBOUNCE_INTERVAL, + .gpio = AC200I_GPIO_BTN_RESET, + .active_low = 1, + }, +}; + +static struct mtd_partition ac200i_nand_partitions[] = { + { + .name = "cfg", + .offset = 0x0100000, + .size = 0x1800000, + .mask_flags = MTD_WRITEABLE, + }, + { + .name = "kernel", + .offset = 0x2000000, + .size = 0x0400000, + }, + { + .name = "ubi", + .offset = 0x2400000, + .size = 0x2000000, + }, + { + .name = "kernel", + .offset = 0x5000000, + .size = 0x0400000, + }, + { + .name = "ubi", + .offset = 0x5400000, + .size = 0x2000000, + }, +}; + +static const char *boot_getenv(const char *key) +{ + const char *start = (const char *) KSEG1ADDR(0x1f070000); + const char *end = start + 0x20000; + const char *addr; + + for (addr = start + 4; + *addr && *addr != 0xff && addr < end && + strnlen(addr, end - addr) < end - addr; + addr += strnlen(addr, end - addr) + 1) { + const char *val; + + val = strchr(addr, '='); + if (!val) + continue; + + if (strncmp(addr, key, val - addr)) + continue; + + return val + 1; + } + return NULL; +} + +static void __init ac200i_setup(void) +{ + const char *img; + u8 *wmac = (u8 *) KSEG1ADDR(AC200I_WMAC_CALDATA_ADDR); + u8 *mac_addr = (u8 *) KSEG1ADDR(AC200I_MAC_ADDR); + + ath79_register_m25p80(NULL); + + ath79_register_leds_gpio(-1, ARRAY_SIZE(ac200i_leds_gpio), + ac200i_leds_gpio); + ath79_register_gpio_keys_polled(-1, AC200I_KEYS_POLL_INTERVAL, + ARRAY_SIZE(ac200i_gpio_keys), + ac200i_gpio_keys); + + ath79_register_usb(); + ath79_nfc_set_parts(ac200i_nand_partitions, + ARRAY_SIZE(ac200i_nand_partitions)); + ath79_nfc_set_ecc_mode(AR934X_NFC_ECC_HW); + ath79_register_nfc(); + + ath79_register_wmac(wmac, NULL); + + ath79_register_mdio(0, 0x0); + ath79_init_mac(ath79_eth0_data.mac_addr, mac_addr, 0); + + /* GMAC0 is connected to the SGMII interface */ + ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII; + ath79_eth0_data.phy_mask = BIT(4); + ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev; + ath79_eth0_pll_data.pll_1000 = 0x03000101; + ath79_eth0_pll_data.pll_100 = 0x80000101; + ath79_eth0_pll_data.pll_10 = 0x80001313; + + img = boot_getenv("dualPartition"); + if (img && !strcmp(img, "imgA")) { + ac200i_nand_partitions[3].name = "kernel_alt"; + ac200i_nand_partitions[4].name = "ubi_alt"; + } else { + ac200i_nand_partitions[1].name = "kernel_alt"; + ac200i_nand_partitions[2].name = "ubi_alt"; + } + + ath79_register_eth(0); + + ath79_register_pci(); +} + +MIPS_MACHINE(ATH79_MACH_WI2A_AC200I, "WI2A-AC200i", + "Nokia WI2A-AC200i", + ac200i_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h index 756d406e1..01472b679 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h +++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h @@ -19,6 +19,7 @@ enum ath79_mach_type { ATH79_MACH_GENERIC = 0, ATH79_MACH_A40, /* OpenMesh A40 */ ATH79_MACH_A60, /* OpenMesh A60 */ + ATH79_MACH_WI2A_AC200I, /* Nokia WI2A-AC200i */ ATH79_MACH_ALFA_AP120C, /* ALFA Network AP120C board */ ATH79_MACH_ALFA_AP96, /* ALFA Network AP96 board */ ATH79_MACH_ALFA_NX, /* ALFA Network N2/N5 board */ @@ -48,6 +49,7 @@ enum ath79_mach_type { ATH79_MACH_ARCHER_C60_V1, /* TP-LINK Archer C60 V1 board */ ATH79_MACH_ARCHER_C7, /* TP-LINK Archer C7 board */ ATH79_MACH_ARCHER_C7_V2, /* TP-LINK Archer C7 V2 board */ + ATH79_MACH_ARCHER_C7_V4, /* TP-LINK Archer C7 V4 board */ ATH79_MACH_ARDUINO_YUN, /* Yun */ ATH79_MACH_AW_NR580, /* AzureWave AW-NR580 */ ATH79_MACH_BHR_4GRV2, /* Buffalo BHR-4GRV2 */ diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index ae1bdf606..566e9513d 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -1089,7 +1089,7 @@ next: while ((skb = __skb_dequeue(&queue)) != NULL) { skb->protocol = eth_type_trans(skb, dev); - napi_gro_receive(&ag->napi, skb); + netif_receive_skb(skb); } DBG("%s: rx finish, curr=%u, dirty=%u, done=%d\n", @@ -1141,7 +1141,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit) DBG("%s: disable polling mode, rx=%d, tx=%d,limit=%d\n", dev->name, rx_done, tx_done, limit); - napi_complete_done(napi, rx_done); + napi_complete(napi); /* enable interrupts */ spin_lock_irqsave(&ag->lock, flags); @@ -1160,7 +1160,7 @@ oom: pr_info("%s: out of memory\n", dev->name); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); - napi_complete_done(napi, rx_done); + napi_complete(napi); return 0; } diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk index 9ba0f0f27..8f7d7cce9 100644 --- a/target/linux/ar71xx/image/mikrotik.mk +++ b/target/linux/ar71xx/image/mikrotik.mk @@ -30,7 +30,7 @@ define Device/rb-nor-flash-16M LOADER_TYPE := elf KERNEL_INSTALL := 1 KERNEL := kernel-bin | lzma | loader-kernel - SUPPORTED_DEVICES := rb-750-r2 rb-750up-r2 rb-941-2nd rb-951ui-2nd rb-952ui-5ac2nd rb-962uigs-5hact2hnt rb-lhg-5nd rb-mapl-2nd + SUPPORTED_DEVICES := rb-750-r2 rb-750up-r2 rb-750p-pbr2 rb-941-2nd rb-951ui-2nd rb-952ui-5ac2nd rb-962uigs-5hact2hnt rb-lhg-5nd rb-mapl-2nd IMAGE/sysupgrade.bin := append-kernel | kernel2minor -s 1024 -e | pad-to $$$$(BLOCKSIZE) | \ append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) endef diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk index 3150159d9..c0639370a 100644 --- a/target/linux/ar71xx/image/nand.mk +++ b/target/linux/ar71xx/image/nand.mk @@ -34,8 +34,8 @@ define Device/domywifi-dw33d DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x BOARDNAME := DW33D IMAGE_SIZE := 16000k - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware);ar934x-nfc:96m(rootfs_data),32m(backup)ro - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 14528k | append-kernel + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,13952k(rootfs),2048k(kernel),64k(art)ro,16000k@0x50000(firmware);ar934x-nfc:96m(rootfs_data),32m(backup)ro + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 13952k | append-kernel | check-size $$$$(IMAGE_SIZE) endef TARGET_DEVICES += domywifi-dw33d @@ -84,6 +84,21 @@ define Device/rambutan endef TARGET_DEVICES += rambutan +define Device/wi2a-ac200i + SUPPORTED_DEVICES = $(1) + DEVICE_TITLE := Nokia WI2A-AC200i + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ath9k kmod-ath10k ath10k-firmware-qca988x + BOARDNAME := WI2A-AC200i + BLOCKSIZE := 64k + KERNEL_SIZE := 3648k + IMAGE_SIZE := 32m + IMAGES := sysupgrade.tar + MTDPARTS := spi0.0:256k(u-boot)ro,64k(envFacA)ro,64k(envFacB)ro,64k(ART)ro,128k(u-boot-env) + KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma + IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata +endef +TARGET_DEVICES += wi2a-ac200i + define Device/z1 DEVICE_TITLE := Meraki Z1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-spi-gpio kmod-ath9k kmod-owl-loader diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index 94cb7f373..4e81251d0 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -200,7 +200,20 @@ define Device/tl-wdr7500-v3 DEVICE_PROFILE := ARCHERC7 TPLINK_HWID := 0x75000003 endef -TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 archer-c7-v2-il tl-wdr7500-v3 + +define Device/archer-c7-v4 + $(Device/archer-cxx) + DEVICE_TITLE := TP-LINK Archer C7 v4 + DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x + BOARDNAME := ARCHER-C7-V4 + TPLINK_BOARD_ID := ARCHER-C7-V4 + IMAGE_SIZE := 15104k + LOADER_TYPE := elf + MTDPARTS := spi0.0:128k(factory-uboot)ro,128k(u-boot)ro,1536k(kernel),13568k(rootfs),960k(config)ro,64k(art)ro,15104k@0x40000(firmware) + SUPPORTED_DEVICES := archer-c7-v4 +endef + +TARGET_DEVICES += archer-c5-v1 archer-c7-v1 archer-c7-v2 archer-c7-v2-il tl-wdr7500-v3 archer-c7-v4 define Device/cpe510-520-v1 DEVICE_TITLE := TP-LINK CPE510/520 v1 diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default index fc243c500..340d64cab 100644 --- a/target/linux/ar71xx/nand/config-default +++ b/target/linux/ar71xx/nand/config-default @@ -180,6 +180,7 @@ CONFIG_ATH79_MACH_RAMBUTAN=y # CONFIG_ATH79_MACH_UBNT_XM is not set # CONFIG_ATH79_MACH_WEIO is not set # CONFIG_ATH79_MACH_WHR_HP_G300N is not set +CONFIG_ATH79_MACH_WI2A_AC200I=y # CONFIG_ATH79_MACH_WLAE_AG300N is not set # CONFIG_ATH79_MACH_WLR8100 is not set # CONFIG_ATH79_MACH_WNDAP360 is not set diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index dceba75da..219d1985a 100644 --- a/tools/firmware-utils/src/tplink-safeloader.c +++ b/tools/firmware-utils/src/tplink-safeloader.c @@ -485,6 +485,49 @@ static struct device_info boards[] = { .last_sysupgrade_partition = "file-system" }, + /** Firmware layout for the C7 */ + { + .id = "ARCHER-C7-V4", + .support_list = + "SupportList:\n" + "{product_name:Archer C7,product_ver:4.0.0,special_id:45550000}\n" + "{product_name:Archer C7,product_ver:4.0.0,special_id:55530000}\n" + "{product_name:Archer C7,product_ver:4.0.0,special_id:43410000}\n", + .support_trail = '\x00', + .soft_ver = "soft_ver:1.0.0\n", + + /** + We use a bigger os-image partition than the stock images (and thus + smaller file-system), as our kernel doesn't fit in the stock firmware's + 1MB os-image. + */ + .partitions = { + {"factory-boot", 0x00000, 0x20000}, + {"fs-uboot", 0x20000, 0x20000}, + {"os-image", 0x40000, 0x180000}, /* Stock: base 0x40000 size 0x120000 */ + {"file-system", 0x1c0000, 0xd40000}, /* Stock: base 0x160000 size 0xda0000 */ + {"default-mac", 0xf00000, 0x00200}, + {"pin", 0xf00200, 0x00200}, + {"device-id", 0xf00400, 0x00100}, + {"product-info", 0xf00500, 0x0fb00}, + {"soft-version", 0xf10000, 0x00100}, + {"extra-para", 0xf11000, 0x01000}, + {"support-list", 0xf12000, 0x0a000}, + {"profile", 0xf1c000, 0x04000}, + {"default-config", 0xf20000, 0x10000}, + {"user-config", 0xf30000, 0x40000}, + {"qos-db", 0xf70000, 0x40000}, + {"certificate", 0xfb0000, 0x10000}, + {"partition-table", 0xfc0000, 0x10000}, + {"log", 0xfd0000, 0x20000}, + {"radio", 0xff0000, 0x10000}, + {NULL, 0, 0} + }, + + .first_sysupgrade_partition = "os-image", + .last_sysupgrade_partition = "file-system", + }, + /** Firmware layout for the C9 */ { .id = "ARCHERC9", @@ -1214,6 +1257,9 @@ static void build_image(const char *output, if (strcasecmp(info->id, "ARCHER-C25-V1") == 0) { const char mdat[11] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}; parts[5] = put_data("extra-para", mdat, 11); + } else if (strcasecmp(info->id, "ARCHER-C7-V4") == 0) { + const char mdat[11] = {0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0xca, 0x00, 0x01, 0x00, 0x00}; + parts[5] = put_data("extra-para", mdat, 11); } size_t len; From c682ebad62712b6278f1d7a3d45211b84ec1012e Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 20 Oct 2017 13:23:12 +0800 Subject: [PATCH 2/2] enable generate EFI+GPT grub2 ext4 images for x86/x64 platforms --- config/Config-images.in | 31 +++-- .../base-files/files/lib/upgrade/common.sh | 18 +++ package/boot/grub2/{Makefile => common.mk} | 40 +----- package/boot/grub2/grub2-efi/Makefile | 22 ++++ package/boot/grub2/grub2/Makefile | 33 +++++ target/linux/x86/image/Makefile | 121 +++++++++++++++++- target/linux/x86/image/gen_image_efi.sh | 44 +++++++ tools/Makefile | 2 + tools/gptfdisk/Makefile | 37 ++++++ tools/popt/Makefile | 20 +++ 10 files changed, 320 insertions(+), 48 deletions(-) rename package/boot/grub2/{Makefile => common.mk} (58%) create mode 100644 package/boot/grub2/grub2-efi/Makefile create mode 100644 package/boot/grub2/grub2/Makefile create mode 100755 target/linux/x86/image/gen_image_efi.sh create mode 100644 tools/gptfdisk/Makefile create mode 100644 tools/popt/Makefile diff --git a/config/Config-images.in b/config/Config-images.in index 9b19efbe9..a7b279d48 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -184,22 +184,31 @@ menu "Target Images" depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS select PACKAGE_grub2 default y + + config EFI_IMAGES + bool "Build EFI GRUB images (Linux x86 or x86_64 host only)" + depends on TARGET_x86 + depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS + select PACKAGE_grub2 + select PACKAGE_grub2-efi + default n + config GRUB_CONSOLE bool "Use Console Terminal (in addition to Serial)" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2) default y config GRUB_SERIAL string "Serial port device" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES default "hvc0" if TARGET_x86_xen_domu default "ttyS0" if ! TARGET_x86_xen_domu config GRUB_BAUDRATE int "Serial port baud rate" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES default 38400 if TARGET_x86_generic default 115200 @@ -210,14 +219,14 @@ menu "Target Images" config GRUB_BOOTOPTS string "Extra kernel boot options" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES default "xencons=hvc" if TARGET_x86_xen_domu help If you don't know, just leave it blank. config GRUB_TIMEOUT string "Seconds to wait before booting the default entry" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES default "0" help If you don't know, 5 seconds is a reasonable default. @@ -225,21 +234,21 @@ menu "Target Images" config VDI_IMAGES bool "Build VirtualBox image files (VDI)" depends on TARGET_x86 || TARGET_x86_64 - select GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 config VMDK_IMAGES bool "Build VMware image files (VMDK)" depends on TARGET_x86 || TARGET_x86_64 - select GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 default y config TARGET_IMAGES_PAD bool "Pad images to filesystem size (for JFFS2)" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES config TARGET_IMAGES_GZIP bool "GZip images" @@ -252,19 +261,19 @@ menu "Target Images" config TARGET_KERNEL_PARTSIZE int "Kernel partition size (in MB)" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES default 8 config TARGET_ROOTFS_PARTSIZE int "Root filesystem partition size (in MB)" - depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu || TARGET_uml + depends on GRUB_IMAGES || EFI_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu || TARGET_uml default 96 help Select the root filesystem partition size. config TARGET_ROOTFS_PARTNAME string "Root partition on target device" - depends on GRUB_IMAGES + depends on GRUB_IMAGES || EFI_IMAGES help Override the root partition on the final device. If left empty, it will be mounted by PARTUUID which makes the kernel find the diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 428ec735d..e1f6ded68 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -117,6 +117,24 @@ export_bootdevice() { esac case "$disk" in + PARTUUID=[A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9]0002) + uuid="${disk#PARTUUID=}" + uuid="${uuid%0002}0002" + for disk in $(find /dev -type b); do + set -- $(dd if=$disk bs=1 skip=$((2*512+256+128+16)) count=16 2>/dev/null | hexdump -v -e '4/1 "%02x"' | awk '{ \ + for(i=1;i<9;i=i+2) first=substr($0,i,1) substr($0,i+1,1) first; \ + for(i=9;i<13;i=i+2) second=substr($0,i,1) substr($0,i+1,1) second; \ + for(i=13;i<16;i=i+2) third=substr($0,i,1) substr($0,i+1,1) third; \ + fourth = substr($0,17,4); \ + five = substr($0,21,12); \ + } END { print toupper(first"-"second"-"third"-"fourth"-"five) }') + if [ "$1" = "$uuid" ]; then + uevent="/sys/class/block/${disk##*/}/uevent" + export SAVE_PARTITIONS=0 + break + fi + done +;; PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02) uuid="${disk#PARTUUID=}" uuid="${uuid%-02}" diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/common.mk similarity index 58% rename from package/boot/grub2/Makefile rename to package/boot/grub2/common.mk index b9e79e102..0f528f0b6 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/common.mk @@ -1,33 +1,24 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=grub PKG_VERSION:=2.02 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE:=grub-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/grub PKG_HASH:=810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f PKG_FIXUP:=autoreconf HOST_BUILD_PARALLEL:=1 -PKG_BUILD_DEPENDS:=grub2/host PKG_SSP:=0 PKG_FLAGS:=nonshared +PATCH_DIR := ../patches +HOST_PATCH_DIR := ../patches + include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -define Package/grub2 +define Package/grub2/Default CATEGORY:=Boot Loaders SECTION:=boot TITLE:=GRand Unified Bootloader @@ -35,19 +26,6 @@ define Package/grub2 DEPENDS:=@TARGET_x86||TARGET_x86_64 endef -define Package/grub2-editenv - CATEGORY:=Utilities - SECTION:=utils - SUBMENU:=Boot Loaders - TITLE:=Grub2 Environment editor - URL:=http://www.gnu.org/software/grub/ - DEPENDS:=@TARGET_x86||TARGET_x86_64 -endef - -define Package/grub2-editenv/description - Edit grub2 environment files. -endef - HOST_BUILD_PREFIX := $(STAGING_DIR_HOST) CONFIGURE_VARS += \ @@ -81,11 +59,3 @@ define Host/Configure $(Host/Configure/Default) endef -define Package/grub2-editenv/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ -endef - -$(eval $(call HostBuild)) -$(eval $(call BuildPackage,grub2)) -$(eval $(call BuildPackage,grub2-editenv)) diff --git a/package/boot/grub2/grub2-efi/Makefile b/package/boot/grub2/grub2-efi/Makefile new file mode 100644 index 000000000..37e0b353e --- /dev/null +++ b/package/boot/grub2/grub2-efi/Makefile @@ -0,0 +1,22 @@ +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=grub-efi + +include ../common.mk + +TAR_OPTIONS:= --transform 's/grub-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}/' $(TAR_OPTIONS) + +PKG_BUILD_DEPENDS:=grub2-efi/host + +CONFIGURE_ARGS += --with-platform=efi +HOST_CONFIGURE_ARGS += --with-platform=efi --program-suffix=-efi + +define Package/grub2-efi +$(call Package/grub2/Default) +HIDDEN:=1 +TITLE += (with EFI support) +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,grub2-efi)) diff --git a/package/boot/grub2/grub2/Makefile b/package/boot/grub2/grub2/Makefile new file mode 100644 index 000000000..c00797662 --- /dev/null +++ b/package/boot/grub2/grub2/Makefile @@ -0,0 +1,33 @@ +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=grub + +include ../common.mk + +PKG_BUILD_DEPENDS:=grub2/host + +define Package/grub2 +$(call Package/grub2/Default) +endef + +define Package/grub2-editenv + CATEGORY:=Utilities + SECTION:=utils + TITLE:=Grub2 Environment editor + URL:=http://www.gnu.org/software/grub/ + DEPENDS:=@TARGET_x86||TARGET_x86_64 +endef + +define Package/grub2-editenv/description + Edit grub2 environment files. +endef + +define Package/grub2-editenv/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/grub-editenv $(1)/usr/sbin/ +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,grub2)) +$(eval $(call BuildPackage,grub2-editenv)) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 8a3cb327e..3b5e642d1 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -10,6 +10,9 @@ include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga +GRUB2_MODULES_LEGACY = $(GRUB2_MODULES) +GRUB2_MODULES_LEGACY += part_gpt search fat exfat +GRUB2_MODULES_EFI = boot chain configfile ext2 linux ls part_msdos reboot serial part_gpt part_msdos search fat exfat ext2 efi_gop efi_uga gfxterm GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga GRUB_TERMINALS = GRUB_SERIAL_CONFIG = @@ -42,6 +45,8 @@ ifneq ($(GRUB_TERMINALS),) endif SIGNATURE:=$(shell perl -e 'printf("%08x", rand(0xFFFFFFFF))') +EFI_SIGNATURE:=$(shell perl -e 'printf("%08x-%04x-%04x-%04x-%06x%06x", rand(0xFFFFFFFF), rand(0xFFFF), rand(0xFFFF), rand(0xFFFF), rand(0xFFFFFF), rand(0xFFFFFF))') + ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02) @@ -51,7 +56,7 @@ ifneq ($(CONFIG_TARGET_x86_xen_domu),) GRUB_ROOT = xen/xvda,msdos1 endif -ifneq ($(CONFIG_GRUB_IMAGES),) +ifneq ($(CONFIG_GRUB_IMAGES)$(CONFIG_EFI_IMAGES),) BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS)) @@ -63,6 +68,90 @@ ifneq ($(CONFIG_GRUB_IMAGES),) root=$(ROOTPART) rootfstype=squashfs rootwait endef + ifneq ($(CONFIG_EFI_IMAGES),) + + define Image/cmdline/efi + $(subst $(SIGNATURE)-02,$2,$(call Image/cmdline/$(1))) + endef + + define Image/Build/efi + # left here because the image builder doesnt need these + rm -rf $(KDIR)/root.grub/ || true + $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 + $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz + echo '(hd0) $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img' > $(KDIR)/grub2/device.map + sed \ + -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ + -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ + -e 's#@CMDLINE@#$(strip $(call Image/cmdline/efi,$(1),$(EFI_SIGNATURE)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ + -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ + -e 's#set root.*#search --file /boot/grub/$(SIGNATURE).cfg --set=root#g' \ + ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg + $(CP) $(KDIR)/root.grub/boot/grub/grub.cfg $(KDIR)/root.grub/boot/grub/$(SIGNATURE).cfg + grub-mkimage \ + -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ + -o $(KDIR)/grub2/core.img \ + -O i386-pc \ + -p '(hd0,gpt1)/boot/grub' \ + -c $(KDIR)/root.grub/boot/grub/grub.cfg \ + $(GRUB2_MODULES_LEGACY) + $(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/ + + # Build the efi grub version + rm -rf $(KDIR)/grub2.efi/ || true + $(INSTALL_DIR) $(KDIR)/grub2.efi/efi/boot/ + + # Generate the grub search root config (grub will search for the $(SIGNATURE).cfg file placed on the boot partition as grub does not support search of GPT UUID yet) + echo "search --file /boot/grub/$(SIGNATURE).cfg --set=root" > $(KDIR)/grub2.efi/efi/boot/grub.cfg + echo "configfile /boot/grub/grub.cfg" >> $(KDIR)/grub2.efi/efi/boot/grub.cfg + + # Create the EFI grub binary + grub-mkimage-efi \ + -d $(STAGING_DIR_HOST)/lib/grub/x86_64-efi \ + -o $(KDIR)/grub2.efi/efi/boot/bootx64.efi \ + -O x86_64-efi \ + -p /efi/boot \ + -c $(KDIR)/grub2.efi/efi/boot/grub.cfg \ + $(GRUB2_MODULES_EFI) + + # Generate the EFI VFAT bootfs + rm $(KDIR)/kernel.efi || true + mkfs.fat -C $(KDIR)/kernel.efi -S 512 1024 + mcopy -s -i "$(KDIR)/kernel.efi" $(KDIR)/grub2.efi/* ::/ + + SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" ./gen_image_efi.sh \ + $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img \ + $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ + 1 $(KDIR)/kernel.efi \ + 1 \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ + 256 + + # Setup legacy bios for hybrid MBR (optional) + grub-bios-setup \ + --device-map="$(KDIR)/grub2/device.map" \ + -d "$(KDIR)/grub2" \ + -r "hd0,msdos1" \ + "$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" + + # Convert the MBR partition to GPT and set EFI ROOTFS signature + dd if=/dev/zero of="$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" bs=512 count=33 conv=notrunc oflag=append + sgdisk -g "$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" + sgdisk -t 2:EF00 "$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" + sgdisk -t 3:EF02 "$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" + sgdisk -u 4:$(EFI_SIGNATURE) "$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" + sgdisk -h "$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" + + # Setup EFI grub + grub-bios-setup-efi \ + --device-map="$(KDIR)/grub2/device.map" \ + -d "$(KDIR)/grub2" \ + -r "hd0,gpt1" \ + "$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img" + endef + endif + + ifneq ($(CONFIG_GRUB_IMAGES),) define Image/Build/grub2 # left here because the image builder doesnt need these $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 @@ -94,6 +183,8 @@ ifneq ($(CONFIG_GRUB_IMAGES),) -r "hd0,msdos1" \ "$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img" endef + endif + endif define Image/Build/squashfs @@ -133,6 +224,14 @@ ifneq ($(CONFIG_VDI_IMAGES),) # XXX: VBoxManage insists on setting perms to 0600 chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi endef + define Image/Build/vdi_efi + rm $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).vdi || true + qemu-img convert -f raw -O vdi \ + $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img \ + $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).vdi + # XXX: VBoxManage insists on setting perms to 0600 + chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).vdi + endef endif ifneq ($(CONFIG_VMDK_IMAGES),) @@ -142,11 +241,22 @@ ifneq ($(CONFIG_VMDK_IMAGES),) $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk endef + define Image/Build/vmdk_efi + rm $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).vmdk || true + qemu-img convert -f raw -O vmdk \ + $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img \ + $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).vmdk + endef endif define Image/Build/gzip - gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img +ifneq ($(CONFIG_GRUB_IMAGES),) + gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img +endif +ifneq ($(CONFIG_EFI_IMAGES),) + gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img +endif endef ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) @@ -174,8 +284,15 @@ define Image/Build $(call Image/Build/$(1)) ifneq ($(1),iso) $(call Image/Build/grub2,$(1)) + $(call Image/Build/efi,$(1)) +ifneq ($(CONFIG_GRUB_IMAGES),) $(call Image/Build/vdi,$(1)) $(call Image/Build/vmdk,$(1)) +endif +ifneq ($(CONFIG_EFI_IMAGES),) + $(call Image/Build/vdi_efi,$(1)) + $(call Image/Build/vmdk_efi,$(1)) +endif $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img else $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso diff --git a/target/linux/x86/image/gen_image_efi.sh b/target/linux/x86/image/gen_image_efi.sh new file mode 100755 index 000000000..3ecb25fed --- /dev/null +++ b/target/linux/x86/image/gen_image_efi.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash +set -x +[ $# == 8 -o $# == 9 ] || { + echo "SYNTAX: $0 []" + exit 1 +} + +OUTPUT="$1" +KERNELSIZE="$2" +KERNELDIR="$3" +EFISIZE="$4" +EFIIMAGE="$5" +EFIGRUBSIZE="$6" +ROOTFSSIZE="$7" +ROOTFSIMAGE="$8" +ALIGN="$9" + +rm -f "$OUTPUT" + +head=16 +sect=63 +cyl=$(( ($KERNELSIZE + $EFISIZE + $EFIGRUBSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512) )) + +# create partition table +set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${EFISIZE}m -p ${EFIGRUBSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}` + +KERNELOFFSET="$(($1 / 512))" +KERNELSIZE="$2" +EFIOFFSET="$(($3 / 512))" +EFISIZE="$(($4 / 512))" +EFIGRUBOFFSET="$(($5 / 512))" +EFIGRUBSIZE="$(($6 / 512))" +ROOTFSOFFSET="$(($7 / 512))" +ROOTFSSIZE="$(($8 / 512))" + +dd if=/dev/zero of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc count="$ROOTFSSIZE" +dd if="$ROOTFSIMAGE" of="$OUTPUT" bs=512 seek="$ROOTFSOFFSET" conv=notrunc +dd if="$EFIIMAGE" of="$OUTPUT" bs=512 seek="$EFIOFFSET" conv=notrunc + +[ -n "$NOGRUB" ] && exit 0 + +make_ext4fs -J -l "$KERNELSIZE" "$OUTPUT.kernel" "$KERNELDIR" +dd if="$OUTPUT.kernel" of="$OUTPUT" bs=512 seek="$KERNELOFFSET" conv=notrunc +rm -f "$OUTPUT.kernel" diff --git a/tools/Makefile b/tools/Makefile index 50bd552d7..a95342f50 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -29,6 +29,7 @@ tools-y += mm-macros missing-macros cmake scons bc findutils gengetopt patchelf tools-y += mtools dosfstools libressl tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_TARGET_x86) += qemu +tools-$(CONFIG_EFI_IMAGES) += popt gptfdisk tools-$(CONFIG_TARGET_mxs) += elftosb sdimage tools-$(CONFIG_TARGET_ar71xx) += lzma-old squashfs tools-$(CONFIG_USES_MINOR) += kernel2minor @@ -71,6 +72,7 @@ $(curdir)/libressl/compile := $(curdir)/pkg-config/compile $(curdir)/mkimage/compile += $(curdir)/libressl/compile $(curdir)/firmware-utils/compile += $(curdir)/libressl/compile $(curdir)/cmake/compile += $(curdir)/libressl/compile +$(curdir)/gptfdisk/compile += $(curdir)/popt/compile $(curdir)/e2fsprogs/compile ifneq ($(HOST_OS),Linux) tools-y += coreutils diff --git a/tools/gptfdisk/Makefile b/tools/gptfdisk/Makefile new file mode 100644 index 000000000..dc5a5eb0d --- /dev/null +++ b/tools/gptfdisk/Makefile @@ -0,0 +1,37 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=gptfdisk +PKG_VERSION:=1.0.1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.rodsbooks.com/gdisk/ +PKG_HASH:=864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7 + +HOST_BUILD_PARALLEL := 1 + +include $(INCLUDE_DIR)/host-build.mk + +HOST_CONFIGURE_VARS += \ + MAKEFLAGS="$(HOST_JOBS)" \ + CXXFLAGS="$(HOST_CFLAGS)" + +HOST_CONFIGURE_ARGS := \ + $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \ + --prefix=$(STAGING_DIR_HOST) + +define Host/Compile + $(MAKE) LDFLAGS="$(HOST_LDFLAGS)" CXXFLAGS="$(HOST_CFLAGS) -I$(STAGING_DIR_HOST)/include/e2fsprogs" -C $(HOST_BUILD_DIR) sgdisk +endef + +define Host/Install + $(INSTALL_BIN) $(HOST_BUILD_DIR)/sgdisk $(STAGING_DIR_HOST)/bin/ +endef + +define Host/Clean + rm -f $(STAGING_DIR_HOST)/bin/sgdisk +endef + +HOSTCC := $(HOSTCC_NOCACHE) +HOSTCXX := $(HOSTCXX_NOCACHE) + +$(eval $(call HostBuild)) diff --git a/tools/popt/Makefile b/tools/popt/Makefile new file mode 100644 index 000000000..7d1a1f8ef --- /dev/null +++ b/tools/popt/Makefile @@ -0,0 +1,20 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=popt +PKG_VERSION:=1.16 +PKG_HASH:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://rpm5.org/files/popt/ +PKG_LICENSE:=MIT + +HOST_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/host-build.mk + +HOST_CONFIGURE_ARGS += --disable-shared --disable-nls +HOST_CFLAGS += $(FPIC) + +$(eval $(call HostBuild)) +