diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-22 08:29:10 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-22 10:23:29 -0600 |
| commit | 0eb249748e067dc5cfedc250fbbd03747a06d487 (patch) | |
| tree | 4b3cf598e32ff7274e2b77bd9c708d8a5f0526af /board | |
| parent | 1dd659fd626204bb6a6b4f330c27b11a7823bbb0 (diff) | |
| parent | 00d847def6847f7dea22d3d8a3d51e8ff9b5431b (diff) | |
Merge branch 'staging' of https://source.denx.de/u-boot/custodians/u-boot-tegra
Diffstat (limited to 'board')
7 files changed, 9 insertions, 0 deletions
diff --git a/board/asus/transformer-t30/configs/p1801-t.config b/board/asus/transformer-t30/configs/p1801-t.config index fab2912132c..f378f54570d 100644 --- a/board/asus/transformer-t30/configs/p1801-t.config +++ b/board/asus/transformer-t30/configs/p1801-t.config @@ -1,2 +1,3 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-p1801-t" +# CONFIG_I2C_MUX is not set CONFIG_USB_GADGET_PRODUCT_NUM=0x4cb0 diff --git a/board/asus/transformer-t30/configs/tf201.config b/board/asus/transformer-t30/configs/tf201.config index 296743b7748..e4fd30378a1 100644 --- a/board/asus/transformer-t30/configs/tf201.config +++ b/board/asus/transformer-t30/configs/tf201.config @@ -1,2 +1,3 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf201" +# CONFIG_I2C_MUX is not set CONFIG_USB_GADGET_PRODUCT_NUM=0x4d00 diff --git a/board/asus/transformer-t30/configs/tf300t.config b/board/asus/transformer-t30/configs/tf300t.config index 32a92fe76fa..9ad2ebd98e8 100644 --- a/board/asus/transformer-t30/configs/tf300t.config +++ b/board/asus/transformer-t30/configs/tf300t.config @@ -1,2 +1,3 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf300t" +# CONFIG_I2C_MUX is not set CONFIG_USB_GADGET_PRODUCT_NUM=0x4d00 diff --git a/board/asus/transformer-t30/configs/tf300tg.config b/board/asus/transformer-t30/configs/tf300tg.config index 1396294f6de..7b44a91acc4 100644 --- a/board/asus/transformer-t30/configs/tf300tg.config +++ b/board/asus/transformer-t30/configs/tf300tg.config @@ -1,2 +1,3 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf300tg" +# CONFIG_I2C_MUX is not set CONFIG_USB_GADGET_PRODUCT_NUM=0x4c80 diff --git a/board/asus/transformer-t30/configs/tf300tl.config b/board/asus/transformer-t30/configs/tf300tl.config index 3db033c8df4..81e96d5df6f 100644 --- a/board/asus/transformer-t30/configs/tf300tl.config +++ b/board/asus/transformer-t30/configs/tf300tl.config @@ -1,2 +1,3 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf300tl" +# CONFIG_I2C_MUX is not set CONFIG_USB_GADGET_PRODUCT_NUM=0x4d00 diff --git a/board/asus/transformer-t30/configs/tf600t.config b/board/asus/transformer-t30/configs/tf600t.config index e40d0fdd479..b3734869f59 100644 --- a/board/asus/transformer-t30/configs/tf600t.config +++ b/board/asus/transformer-t30/configs/tf600t.config @@ -1,4 +1,6 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf600t" CONFIG_BOOTCOMMAND="setenv gpio_button 222; if run check_button; then poweroff; fi; setenv gpio_button 132; if run check_button; then echo Starting SPI flash update ...; run update_spi; fi; run bootcmd_usb0; run bootcmd_mmc1; run bootcmd_mmc0; poweroff;" +# CONFIG_I2C_MUX is not set +CONFIG_TEGRA20_SLINK=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_USB_GADGET_PRODUCT_NUM=0x4d00 diff --git a/board/asus/transformer-t30/configs/tf700t.config b/board/asus/transformer-t30/configs/tf700t.config index 066c884d082..887c25fbf22 100644 --- a/board/asus/transformer-t30/configs/tf700t.config +++ b/board/asus/transformer-t30/configs/tf700t.config @@ -1,2 +1,4 @@ CONFIG_DEFAULT_DEVICE_TREE="tegra30-asus-tf700t" +CONFIG_CLK_GPIO=y CONFIG_USB_GADGET_PRODUCT_NUM=0x4c90 +CONFIG_VIDEO_BRIDGE_TOSHIBA_TC358768=y |