OpenWrt – Blame information for rev 2

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 --- a/common/spl/Makefile
2 +++ b/common/spl/Makefile
3 @@ -19,4 +19,5 @@ obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc
4 obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o
5 obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o
6 obj-$(CONFIG_SPL_SATA_SUPPORT) += spl_sata.o
7 +obj-$(CONFIG_SPL_BLOCK_SUPPORT) += spl_block.o
8 endif
9 --- a/common/spl/spl.c
10 +++ b/common/spl/spl.c
11 @@ -191,6 +191,14 @@ void board_init_r(gd_t *dummy1, ulong du
12 spl_spi_load_image();
13 break;
14 #endif
15 +#ifdef CONFIG_SPL_BLOCK_SUPPORT
16 + case BOOT_DEVICE_BLOCK:
17 + {
18 + extern void spl_block_load_image(void);
19 + spl_block_load_image();
20 + break;
21 + }
22 +#endif
23 #ifdef CONFIG_SPL_ETH_SUPPORT
24 case BOOT_DEVICE_CPGMAC:
25 #ifdef CONFIG_SPL_ETH_DEVICE
26 --- a/common/cmd_nvedit.c
27 +++ b/common/cmd_nvedit.c
28 @@ -49,6 +49,7 @@ DECLARE_GLOBAL_DATA_PTR;
29 !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \
30 !defined(CONFIG_ENV_IS_IN_REMOTE) && \
31 !defined(CONFIG_ENV_IS_IN_UBI) && \
32 + !defined(CONFIG_ENV_IS_IN_EXT4) && \
33 !defined(CONFIG_ENV_IS_NOWHERE)
34 # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\
35 SPI_FLASH|NVRAM|MMC|FAT|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE
36 --- a/common/Makefile
37 +++ b/common/Makefile
38 @@ -63,6 +63,7 @@ obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_o
39 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
40 obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o
41 obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o
42 +obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o
43 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
44  
45 # command
46 @@ -213,6 +214,8 @@ obj-$(CONFIG_UPDATE_TFTP) += update.o
47 obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
48 obj-$(CONFIG_CMD_DFU) += cmd_dfu.o
49 obj-$(CONFIG_CMD_GPT) += cmd_gpt.o
50 +else
51 +obj-$(CONFIG_SPL_BLOCK_SUPPORT) += cmd_ide.o
52 endif
53  
54 ifdef CONFIG_SPL_BUILD