#include <netdev.h>
#include <mmc.h>
#include <mxcfb.h>
+#include <video_fb.h>
#include <linux/list.h>
#include <linux/fb.h>
#include <asm/io.h>
#define STK5_CAN_XCVR_GPIO MX28_PAD_LCD_D00__GPIO_1_0
static const struct gpio tx28_gpios[] = {
- { TX28_USBH_VBUSEN_GPIO, GPIOF_OUTPUT_INIT_LOW, "USBH VBUSEN", },
- { TX28_USBH_OC_GPIO, GPIOF_INPUT, "USBH OC", },
- { TX28_USBOTG_VBUSEN_GPIO, GPIOF_OUTPUT_INIT_LOW, "USBOTG VBUSEN", },
- { TX28_USBOTG_OC_GPIO, GPIOF_INPUT, "USBOTG OC", },
- { TX28_USBOTG_ID_GPIO, GPIOF_INPUT, "USBOTG ID", },
+ { TX28_USBH_VBUSEN_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "USBH VBUSEN", },
+ { TX28_USBH_OC_GPIO, GPIOFLAG_INPUT, "USBH OC", },
+ { TX28_USBOTG_VBUSEN_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "USBOTG VBUSEN", },
+ { TX28_USBOTG_OC_GPIO, GPIOFLAG_INPUT, "USBOTG OC", },
+ { TX28_USBOTG_ID_GPIO, GPIOFLAG_INPUT, "USBOTG ID", },
};
static const iomux_cfg_t tx28_pads[] = {
/* provide at least _some_ sort of randomness */
#define MAX_LOOPS 100
-static u32 random;
+static u32 random __attribute__((section("data")));
static inline void random_init(void)
{
int i;
for (i = 0; i < MAX_LOOPS; i++) {
- unsigned int usec = readl(&digctl_regs->hw_digctl_microseconds);
+ u32 hclk = readl(&digctl_regs->hw_digctl_hclkcount);
+ u32 entropy = readl(&digctl_regs->hw_digctl_entropy);
+ u32 usec = readl(&digctl_regs->hw_digctl_microseconds);
- seed = get_timer(usec + random + seed);
+ seed = get_timer(hclk ^ entropy ^ usec ^ random ^ seed);
srand(seed);
random = rand();
}
while ((rtc_stat = readl(&rtc_regs->hw_rtc_stat)) &
RTC_STAT_STALE_REGS_PERSISTENT0) {
if (timeout-- < 0)
- return 0;
+ return 1;
udelay(1);
}
boot_cause = readl(&rtc_regs->hw_rtc_persistent0);
rtc_err:
serial_puts("Inconsistent value in RTC_PERSISTENT0 register; power-on-reset required\n");
- return 0;
+ return 1;
}
int board_init(void)
{
+ if (ctrlc())
+ printf("CTRL-C detected; safeboot enabled\n");
+
/* Address of boot parameters */
#ifdef CONFIG_OF_LIBFDT
gd->bd->bi_arch_number = -1;
#ifdef CONFIG_FEC_MXC
#ifdef CONFIG_GET_FEC_MAC_ADDR_FROM_IIM
-#ifdef CONFIG_FEC_MXC_MULTI
+#ifndef CONFIG_TX28_S
#define FEC_MAX_IDX 1
#else
#define FEC_MAX_IDX 0
val = readl(&cust[index * 8 + i]);
mac[i] = val >> shift;
}
- if (!is_valid_ether_addr(mac)) {
+ if (!is_valid_ethaddr(mac)) {
if (index == 0)
printf("No valid MAC address programmed\n");
return 0;
eth_setenv_enetaddr(env_name, mac);
return 0;
}
+
+static inline int tx28_fec1_enabled(void)
+{
+ const char *status;
+ int off;
+
+ if (!gd->fdt_blob)
+ return 0;
+
+ off = fdt_path_offset(gd->fdt_blob, "ethernet1");
+ if (off < 0)
+ return 0;
+
+ status = fdt_getprop(gd->fdt_blob, off, "status", NULL);
+ return status && (strcmp(status, "okay") == 0);
+}
+
+static void tx28_init_mac(void)
+{
+ int ret;
+
+ ret = fec_get_mac_addr(0);
+ if (ret < 0) {
+ printf("Failed to read FEC0 MAC address from OCOTP\n");
+ return;
+ }
+#ifdef CONFIG_TX28_S
+ if (tx28_fec1_enabled()) {
+ ret = fec_get_mac_addr(1);
+ if (ret < 0) {
+ printf("Failed to read FEC1 MAC address from OCOTP\n");
+ return;
+ }
+ }
+#endif
+}
+#else
+static inline void tx28_init_mac(void)
+{
+}
#endif /* CONFIG_GET_FEC_MAC_ADDR_FROM_IIM */
static const iomux_cfg_t tx28_fec_pads[] = {
return ret;
}
-#ifdef CONFIG_FEC_MXC_MULTI
+#ifndef CONFIG_TX28_S
if (getenv("ethaddr")) {
ret = fecmxc_initialize_multi(bis, 0, 0, MXS_ENET0_BASE);
if (ret) {
#endif
return 0;
}
+#else
+static inline void tx28_init_mac(void)
+{
+}
#endif /* CONFIG_FEC_MXC */
enum {
.vl_col = 1600,
.vl_row = 1200,
- .vl_bpix = LCD_COLOR24, /* Bits per pixel, 0: 1bpp, 1: 2bpp, 2: 4bpp, 3: 8bpp ... */
+ .vl_bpix = LCD_COLOR32, /* Bits per pixel, 0: 1bpp, 1: 2bpp, 2: 4bpp, 3: 8bpp ... */
.cmap = tx28_cmap,
};
};
static const struct gpio stk5_lcd_gpios[] = {
- { TX28_LCD_RST_GPIO, GPIOF_OUTPUT_INIT_LOW, "LCD RESET", },
- { TX28_LCD_PWR_GPIO, GPIOF_OUTPUT_INIT_LOW, "LCD POWER", },
- { TX28_LCD_BACKLIGHT_GPIO, GPIOF_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", },
+ { TX28_LCD_RST_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "LCD RESET", },
+ { TX28_LCD_PWR_GPIO, GPIOFLAG_OUTPUT_INIT_LOW, "LCD POWER", },
+ { TX28_LCD_BACKLIGHT_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", },
};
-extern void video_hw_init(void *lcdbase);
-
void lcd_ctrl_init(void *lcdbase)
{
int color_depth = 24;
panel_info.vl_bpix = LCD_COLOR16;
break;
default:
- panel_info.vl_bpix = LCD_COLOR24;
+ panel_info.vl_bpix = LCD_COLOR32;
}
p->pixclock = KHZ2PICOS(refresh *
setenv("videomode", vmode);
debug("Initializing LCD controller\n");
- video_hw_init(lcdbase);
+ video_hw_init();
setenv("videomode", NULL);
} else {
debug("Skipping initialization of LCD controller\n");
stk5_board_init();
/* init flexcan transceiver enable GPIO */
- gpio_request_one(STK5_CAN_XCVR_GPIO, GPIOF_OUTPUT_INIT_HIGH,
+ gpio_request_one(STK5_CAN_XCVR_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH,
"Flexcan Transceiver");
mxs_iomux_setup_pad(STK5_CAN_XCVR_GPIO);
}
-int tx28_fec1_enabled(void)
-{
- const char *status;
- int off;
-
- if (!gd->fdt_blob)
- return 0;
-
- off = fdt_path_offset(gd->fdt_blob, "ethernet1");
- if (off < 0)
- return 0;
-
- status = fdt_getprop(gd->fdt_blob, off, "status", NULL);
- return status && (strcmp(status, "okay") == 0);
-}
-
-static void tx28_init_mac(void)
-{
- int ret;
-
- ret = fec_get_mac_addr(0);
- if (ret < 0) {
- printf("Failed to read FEC0 MAC address from OCOTP\n");
- return;
- }
-#ifdef CONFIG_FEC_MXC_MULTI
- if (tx28_fec1_enabled()) {
- ret = fec_get_mac_addr(1);
- if (ret < 0) {
- printf("Failed to read FEC1 MAC address from OCOTP\n");
- return;
- }
- }
-#endif
-}
-
int board_late_init(void)
{
int ret = 0;
const char *baseboard;
- karo_fdt_move_fdt();
+ env_cleanup();
+
+ if (had_ctrlc())
+ setenv_ulong("safeboot", 1);
+ else
+ karo_fdt_move_fdt();
baseboard = getenv("baseboard");
if (!baseboard)
} else {
printf("WARNING: Unsupported baseboard: '%s'\n",
baseboard);
- ret = -EINVAL;
+ if (!had_ctrlc())
+ ret = -EINVAL;
}
exit:
const char *dlm = "";
printf("Board: Ka-Ro TX28-4%sx%d\n", TX28_MOD_SUFFIX,
- CONFIG_SDRAM_SIZE / SZ_128M +
+ CONFIG_SYS_SDRAM_SIZE / SZ_128M +
CONFIG_SYS_NAND_BLOCKS / 2048 * 2);
printf("POWERUP Source: ");
"fsl,imx28-lradc",
};
-void ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
{
const char *baseboard = getenv("baseboard");
int stk5_v5 = baseboard != NULL && (strcmp(baseboard, "stk5-v5") == 0);
int ret;
ret = fdt_increase_size(blob, 4096);
- if (ret)
+ if (ret) {
printf("Failed to increase FDT size: %s\n", fdt_strerror(ret));
-
+ return ret;
+ }
#ifdef CONFIG_TX28_S
/* TX28-41xx (aka TX28S) has no external RTC
* and no I2C GPIO extender
karo_fdt_enable_node(blob, "stk5led", 0);
fdt_fixup_mtdparts(blob, tx28_nand_nodes, ARRAY_SIZE(tx28_nand_nodes));
- fdt_fixup_ethernet(blob);
karo_fdt_fixup_touchpanel(blob, tx28_touchpanels,
ARRAY_SIZE(tx28_touchpanels));
karo_fdt_fixup_usb_otg(blob, "usbotg", "fsl,usbphy", "vbus-supply");
karo_fdt_fixup_flexcan(blob, stk5_v5);
karo_fdt_update_fb_mode(blob, video_mode);
+
+ return 0;
}
#endif /* CONFIG_OF_BOARD_SETUP */
projects / karo-tx-uboot.git / blobdiff