mirror of
				https://github.com/immortalwrt/immortalwrt.git
				synced 2025-10-30 07:49:55 +08:00 
			
		
		
		
	Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
		| @ -2,7 +2,7 @@ | ||||
| # | ||||
| # Copyright (C) 2006-2013 OpenWrt.org | ||||
|  | ||||
| mainmenu "OpenWrt Configuration" | ||||
| mainmenu "ImmortalWrt Configuration" | ||||
|  | ||||
| config MODULES | ||||
| 	modules | ||||
|  | ||||
| @ -589,10 +589,10 @@ | ||||
| +bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi | ||||
| +bootconf=config-1#mt7981b-cmcc-rax3000m-emmc | ||||
| +bootdelay=0 | ||||
| +bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb | ||||
| +bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-preloader.bin | ||||
| +bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-bl31-uboot.fip | ||||
| +bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb | ||||
| +bootfile=immortalwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb | ||||
| +bootfile_bl2=immortalwrt-mediatek-filogic-cmcc_rax3000m-emmc-preloader.bin | ||||
| +bootfile_fip=immortalwrt-mediatek-filogic-cmcc_rax3000m-emmc-bl31-uboot.fip | ||||
| +bootfile_upg=immortalwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb | ||||
| +bootled_pwr=red:status | ||||
| +bootled_rec=blue:status | ||||
| +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 | ||||
| @ -646,10 +646,10 @@ | ||||
| +bootconf=config-1#mt7981b-cmcc-rax3000m-nand | ||||
| +bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi | ||||
| +bootdelay=0 | ||||
| +bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb | ||||
| +bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-nand-preloader.bin | ||||
| +bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-nand-bl31-uboot.fip | ||||
| +bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb | ||||
| +bootfile=immortalwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb | ||||
| +bootfile_bl2=immortalwrt-mediatek-filogic-cmcc_rax3000m-nand-preloader.bin | ||||
| +bootfile_fip=immortalwrt-mediatek-filogic-cmcc_rax3000m-nand-bl31-uboot.fip | ||||
| +bootfile_upg=immortalwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb | ||||
| +bootled_pwr=red:status | ||||
| +bootled_rec=blue:status | ||||
| +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 | ||||
|  | ||||
| @ -351,7 +351,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com> | ||||
| +		LZMA_FREE(address); | ||||
| +} | ||||
| + | ||||
| +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; | ||||
| +static ISzAlloc lzma_alloc = { .Alloc = p_lzma_malloc, .Free = p_lzma_free }; | ||||
| + | ||||
| +#endif | ||||
| --- /dev/null | ||||
|  | ||||
| @ -351,7 +351,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com> | ||||
| +		LZMA_FREE(address); | ||||
| +} | ||||
| + | ||||
| +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; | ||||
| +static ISzAlloc lzma_alloc = { .Alloc = p_lzma_malloc, .Free = p_lzma_free }; | ||||
| + | ||||
| +#endif | ||||
| --- /dev/null | ||||
|  | ||||
| @ -128,15 +128,17 @@ TARGET_DEVICES += netgear_rax120v2 | ||||
| define Device/netgear_wax218 | ||||
| 	$(call Device/FitImage) | ||||
| 	$(call Device/UbiFit) | ||||
| 	ARTIFACTS := web-ui-factory.fit | ||||
| 	DEVICE_VENDOR := Netgear | ||||
| 	DEVICE_MODEL := WAX218 | ||||
| 	DEVICE_DTS_CONFIG := config@hk07 | ||||
| 	BLOCKSIZE := 128k | ||||
| 	PAGESIZE := 2048 | ||||
| 	SOC := ipq8072 | ||||
| ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) | ||||
| 	ARTIFACTS := web-ui-factory.fit | ||||
| 	ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \ | ||||
| 		ubinize-kernel | qsdk-ipq-factory-nand | ||||
| endif | ||||
| 	DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \ | ||||
| 		ipq-wifi-netgear_wax218 | ||||
| endef | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Tianling Shen
					Tianling Shen