Merge tag '6AO.1.1' into lcard_bringup_o6AO.1.1-lcard-revb

Change-Id: I26bed59c500d1a85735039dce0988d3f56956155

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[] = {
 #ifdef CONFIG_DRA7XX_JAMR3
         {VIN1A_CLK0, (M0 | PIN_INPUT_PULLDOWN)},        /* vin1a_clk0.vin1a_clk0 */
         {VIN1A_DE0, (M0 | PIN_INPUT_PULLDOWN)}, /* vin1a_de0.vin1a_de0 */
-        {VIN1A_FLD0, (M0 | PIN_INPUT_PULLDOWN)},        /* vin1a_fld0.vin1a_fld0 */
         {VIN1A_HSYNC0, (M0 | PIN_INPUT_PULLDOWN)},      /* vin1a_hsync0.vin1a_hsync0 */
         {VIN1A_VSYNC0, (M0 | PIN_INPUT_PULLDOWN)},      /* vin1a_vsync0.vin1a_vsync0 */
         {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 @@
         "name=efs,size=16M,uuid=${uuid_gpt_efs};" \
         "name=crypto,size=16K,uuid=${uuid_gpt_crypto};" \
         "name=recovery,size=30M,uuid=${uuid_gpt_recovery};" \
-        "name=boot,size=10M,uuid=${uuid_gpt_boot};" \
+        "name=boot,size=30M,uuid=${uuid_gpt_boot};" \
         "name=system,size=768M,uuid=${uuid_gpt_system};" \
         "name=vendor,size=256M,uuid=${uuid_gpt_vendor};" \
         "name=cache,size=256M,uuid=${uuid_gpt_cache};" \