X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=board%2Fkaro%2Ftx28%2Ftx28.c;h=ed9846a2df4c4ee3887348570271705d2bc10c95;hp=2e7ec77a1057fa15228f3d1afbdf5259eb499d82;hb=1cb997fab225c07da67d3b9d5b756de1fa25ac03;hpb=ea558300de20bfb9713a6a8f54ed875172da2e51 diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c index 2e7ec77a10..ed9846a2df 100644 --- a/board/karo/tx28/tx28.c +++ b/board/karo/tx28/tx28.c @@ -167,10 +167,8 @@ rtc_err: int board_init(void) { - if (ctrlc()) { + if (ctrlc()) printf("CTRL-C detected; safeboot enabled\n"); - return 1; - } /* Address of boot parameters */ #ifdef CONFIG_OF_LIBFDT @@ -241,7 +239,7 @@ static int fec_get_mac_addr(int index) 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; @@ -1013,7 +1011,6 @@ int ft_board_setup(void *blob, bd_t *bd) 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));