aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2018-08-28 15:00:23 -0500
committerVishal Mahaveer2018-08-28 15:00:23 -0500
commit1ccf371fd928446d30f3cfd727c62e3e7cb72cde (patch)
tree81c816257ecd20b273e652ee28d2eb87513279ec
parent2437280fb7209d0d5cbd8c590cb998978c77f4eb (diff)
parent5ddd5a8a256713300973cb633e84abf2542aaf94 (diff)
downloadu-boot-6AO.1.1-lcard-revb.tar.gz
u-boot-6AO.1.1-lcard-revb.tar.xz
u-boot-6AO.1.1-lcard-revb.zip
Merge tag '6AO.1.1' into lcard_bringup_o6AO.1.1-lcard-revb
Change-Id: I26bed59c500d1a85735039dce0988d3f56956155
-rw-r--r--board/ti/dra7xx/mux_data.h1
-rw-r--r--include/configs/dra7xx_evm.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h
index 02d5be36ae..af3b395f8e 100644
--- a/board/ti/dra7xx/mux_data.h
+++ b/board/ti/dra7xx/mux_data.h
@@ -1297,7 +1297,6 @@ const struct pad_conf_entry dra76x_core_padconf_array[] = {
1297#ifdef CONFIG_DRA7XX_JAMR3 1297#ifdef CONFIG_DRA7XX_JAMR3
1298 {VIN1A_CLK0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_clk0.vin1a_clk0 */ 1298 {VIN1A_CLK0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_clk0.vin1a_clk0 */
1299 {VIN1A_DE0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_de0.vin1a_de0 */ 1299 {VIN1A_DE0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_de0.vin1a_de0 */
1300 {VIN1A_FLD0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_fld0.vin1a_fld0 */
1301 {VIN1A_HSYNC0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_hsync0.vin1a_hsync0 */ 1300 {VIN1A_HSYNC0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_hsync0.vin1a_hsync0 */
1302 {VIN1A_VSYNC0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_vsync0.vin1a_vsync0 */ 1301 {VIN1A_VSYNC0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_vsync0.vin1a_vsync0 */
1303 {VIN1A_D0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_d0.vin1a_d0 */ 1302 {VIN1A_D0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_d0.vin1a_d0 */
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index fadeb78a16..05d88d3ccb 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -64,7 +64,7 @@
64 "name=efs,size=16M,uuid=${uuid_gpt_efs};" \ 64 "name=efs,size=16M,uuid=${uuid_gpt_efs};" \
65 "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \ 65 "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \
66 "name=recovery,size=30M,uuid=${uuid_gpt_recovery};" \ 66 "name=recovery,size=30M,uuid=${uuid_gpt_recovery};" \
67 "name=boot,size=10M,uuid=${uuid_gpt_boot};" \ 67 "name=boot,size=30M,uuid=${uuid_gpt_boot};" \
68 "name=system,size=768M,uuid=${uuid_gpt_system};" \ 68 "name=system,size=768M,uuid=${uuid_gpt_system};" \
69 "name=vendor,size=256M,uuid=${uuid_gpt_vendor};" \ 69 "name=vendor,size=256M,uuid=${uuid_gpt_vendor};" \
70 "name=cache,size=256M,uuid=${uuid_gpt_cache};" \ 70 "name=cache,size=256M,uuid=${uuid_gpt_cache};" \