Commit 1b44cd3ebbd172468a357bcf0d592afbdf743eed

Authored by Andrew F. Davis
Committed by Lokesh Vutla
1 parent 594d79acd3

defconfigs: am335x_hs_evm: Sync HS and non-HS defconfigs

Sync new additions to non-HS defconfig with HS defconfig.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Showing 2 changed files with 20 additions and 6 deletions Side-by-side Diff

configs/am335x_hs_evm_defconfig
... ... @@ -31,13 +31,16 @@
31 31 # CONFIG_SPL_EFI_PARTITION is not set
32 32 CONFIG_OF_CONTROL=y
33 33 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
34   -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
  34 +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
35 35 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
36 36 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
37 37 CONFIG_BOOTCOUNT_LIMIT=y
  38 +CONFIG_CLK=y
  39 +CONFIG_CLK_CDCE9XX=y
38 40 CONFIG_DFU_MMC=y
39 41 CONFIG_DFU_NAND=y
40 42 CONFIG_DFU_RAM=y
  43 +CONFIG_USB_FUNCTION_FASTBOOT=y
41 44 CONFIG_DM_I2C=y
42 45 CONFIG_MISC=y
43 46 CONFIG_DM_MMC=y
... ... @@ -49,7 +52,6 @@
49 52 CONFIG_SF_DEFAULT_SPEED=24000000
50 53 CONFIG_SPI_FLASH_WINBOND=y
51 54 CONFIG_DM_ETH=y
52   -CONFIG_PHY_GIGE=y
53 55 CONFIG_MII=y
54 56 CONFIG_DRIVER_TI_CPSW=y
55 57 CONFIG_SPI=y
... ... @@ -59,6 +61,8 @@
59 61 CONFIG_OMAP_TIMER=y
60 62 CONFIG_USB=y
61 63 CONFIG_DM_USB=y
  64 +CONFIG_DM_USB_GADGET=y
  65 +CONFIG_SPL_DM_USB_GADGET=y
62 66 CONFIG_USB_MUSB_HOST=y
63 67 CONFIG_USB_MUSB_GADGET=y
64 68 CONFIG_USB_MUSB_TI=y
65 69  
66 70  
... ... @@ -66,9 +70,12 @@
66 70 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
67 71 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
68 72 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
69   -CONFIG_USB_GADGET_DOWNLOAD=y
70 73 CONFIG_USB_ETHER=y
  74 +CONFIG_WDT=y
  75 +# CONFIG_SPL_WDT is not set
  76 +CONFIG_DYNAMIC_CRC_TABLE=y
71 77 CONFIG_SPL_TINY_MEMSET=y
72 78 CONFIG_RSA=y
73 79 CONFIG_LZO=y
  80 +# CONFIG_OF_LIBFDT_OVERLAY is not set
configs/am335x_hs_evm_uart_defconfig
... ... @@ -33,13 +33,16 @@
33 33 # CONFIG_SPL_EFI_PARTITION is not set
34 34 CONFIG_OF_CONTROL=y
35 35 CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
36   -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
  36 +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle"
37 37 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
38 38 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
39 39 CONFIG_BOOTCOUNT_LIMIT=y
  40 +CONFIG_CLK=y
  41 +CONFIG_CLK_CDCE9XX=y
40 42 CONFIG_DFU_MMC=y
41 43 CONFIG_DFU_NAND=y
42 44 CONFIG_DFU_RAM=y
  45 +CONFIG_USB_FUNCTION_FASTBOOT=y
43 46 CONFIG_DM_I2C=y
44 47 CONFIG_MISC=y
45 48 CONFIG_DM_MMC=y
... ... @@ -51,7 +54,6 @@
51 54 CONFIG_SF_DEFAULT_SPEED=24000000
52 55 CONFIG_SPI_FLASH_WINBOND=y
53 56 CONFIG_DM_ETH=y
54   -CONFIG_PHY_GIGE=y
55 57 CONFIG_MII=y
56 58 CONFIG_DRIVER_TI_CPSW=y
57 59 CONFIG_SPI=y
... ... @@ -61,6 +63,8 @@
61 63 CONFIG_OMAP_TIMER=y
62 64 CONFIG_USB=y
63 65 CONFIG_DM_USB=y
  66 +CONFIG_DM_USB_GADGET=y
  67 +CONFIG_SPL_DM_USB_GADGET=y
64 68 CONFIG_USB_MUSB_HOST=y
65 69 CONFIG_USB_MUSB_GADGET=y
66 70 CONFIG_USB_MUSB_TI=y
67 71  
68 72  
... ... @@ -68,9 +72,12 @@
68 72 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
69 73 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
70 74 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
71   -CONFIG_USB_GADGET_DOWNLOAD=y
72 75 CONFIG_USB_ETHER=y
  76 +CONFIG_WDT=y
  77 +# CONFIG_SPL_WDT is not set
  78 +CONFIG_DYNAMIC_CRC_TABLE=y
73 79 CONFIG_SPL_TINY_MEMSET=y
74 80 CONFIG_RSA=y
75 81 CONFIG_LZO=y
  82 +# CONFIG_OF_LIBFDT_OVERLAY is not set