From 287f176425dd5bc578caf78a568840b94fc51b8f Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 6 Nov 2015 14:05:43 -0600 Subject: [PATCH 2/2] NFM: Production: eeprom: assume device is BeagleBone Black Signed-off-by: Robert Nelson --- board/ti/am335x/board.c | 17 +++++++++++------ board/ti/am335x/mux.c | 7 +++++-- include/configs/am335x_evm.h | 2 ++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index e6c5ed6..0a3f166 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -40,6 +40,11 @@ DECLARE_GLOBAL_DATA_PTR; static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; +static inline int board_is_blank_bone_lt(void) +{ + return 1; +} + /* * Read header information from EEPROM into global structure. */ @@ -229,7 +234,7 @@ void am33xx_spl_board_init(void) /* Get the frequency */ dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev); - if (board_is_bone(&header) || board_is_bone_lt(&header)) { + if (board_is_bone(&header) || board_is_bone_lt(&header) || board_is_blank_bone_lt()) { /* BeagleBone PMIC Code */ int usb_cur_lim; @@ -263,7 +268,7 @@ void am33xx_spl_board_init(void) * Override what we have detected since we know if we have * a Beaglebone Black it supports 1GHz. */ - if (board_is_bone_lt(&header)) + if (board_is_bone_lt(&header) || board_is_blank_bone_lt()) dpll_mpu_opp100.m = MPUPLL_M_1000; /* @@ -373,7 +378,7 @@ const struct dpll_params *get_dpll_ddr_params(void) if (board_is_evm_sk(&header)) return &dpll_ddr_evm_sk; - else if (board_is_bone_lt(&header)) + else if (board_is_bone_lt(&header) || board_is_blank_bone_lt()) return &dpll_ddr_bone_black; else if (board_is_evm_15_or_later(&header)) return &dpll_ddr_evm_sk; @@ -459,7 +464,7 @@ void sdram_init(void) if (board_is_evm_sk(&header)) config_ddr(303, &ioregs_evmsk, &ddr3_data, &ddr3_cmd_ctrl_data, &ddr3_emif_reg_data, 0); - else if (board_is_bone_lt(&header)) + else if (board_is_bone_lt(&header) || board_is_blank_bone_lt()) config_ddr(400, &ioregs_bonelt, &ddr3_beagleblack_data, &ddr3_beagleblack_cmd_ctrl_data, @@ -637,10 +642,10 @@ int board_eth_init(bd_t *bis) } if (read_eeprom(&header) < 0) - puts("Could not get board ID.\n"); + puts("Could not get board ID, assuming BeagleBone Black.\n"); if (board_is_bone(&header) || board_is_bone_lt(&header) || - board_is_idk(&header)) { + board_is_idk(&header) || board_is_blank_bone_lt()) { writel(MII_MODE_ENABLE, &cdev->miisel); cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_MII; diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index fd3da58..57a8a73 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -365,7 +365,10 @@ void enable_board_pin_mux(struct am335x_baseboard_id *header) configure_module_pin_mux(mmc1_pin_mux); #endif } else { - puts("Unknown board, cannot configure pinmux."); - hang(); + puts("Unknown board: assuming BeagleBone Black."); + /* Beaglebone LT pinmux */ + configure_module_pin_mux(mii1_pin_mux); + configure_module_pin_mux(mmc0_pin_mux); + configure_module_pin_mux(mmc1_pin_mux); } } diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d3f8a23..5428227 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -182,6 +182,8 @@ #define CONFIG_BOOTCOMMAND \ "gpio set 53; " \ "run findfdt; " \ + "setenv fdtfile am335x-boneblack.dtb; "\ + "setenv fdtbase am335x-boneblack; "\ "setenv interface mmc; " \ "setenv mmcdev 0; " \ "setenv bootpart 0:1; " \ -- 2.6.2