Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f39c008e924341fac899a352f7f6e83325893aee

Authored by Fabio Estevam
Committed by Albert ARIBAUD
1 parent 9aa3c6a1ee
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

mx25pdk: Place machine ID into board config 

Let common code set the machine ID.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Showing 2 changed files with 2 additions and 1 deletions Inline Diff

board/freescale/mx25pdk/mx25pdk.c
Diff comments   View file @ f39c008
1 /* 1 /*
2 * (C) Copyright 2011 Freescale Semiconductor, Inc. 2 * (C) Copyright 2011 Freescale Semiconductor, Inc.
3 * 3 *
4 * Author: Fabio Estevam <fabio.estevam@freescale.com> 4 * Author: Fabio Estevam <fabio.estevam@freescale.com>
5 * 5 *
6 * See file CREDITS for list of people who contributed to this 6 * See file CREDITS for list of people who contributed to this
7 * project. 7 * project.
8 * 8 *
9 * This program is free software; you can redistribute it and/or 9 * This program is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU General Public License as 10 * modify it under the terms of the GNU General Public License as
11 * published by the Free Software Foundation; either version 2 of 11 * published by the Free Software Foundation; either version 2 of
12 * the License, or (at your option) any later version. 12 * the License, or (at your option) any later version.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details. 17 * GNU General Public License for more details.
18 */ 18 */
19 19
20 #include <common.h> 20 #include <common.h>
21 #include <asm/io.h> 21 #include <asm/io.h>
22 #include <asm/arch/imx-regs.h> 22 #include <asm/arch/imx-regs.h>
23 #include <asm/arch/imx25-pinmux.h> 23 #include <asm/arch/imx25-pinmux.h>
24 #include <asm/arch/sys_proto.h> 24 #include <asm/arch/sys_proto.h>
25 25
26 DECLARE_GLOBAL_DATA_PTR; 26 DECLARE_GLOBAL_DATA_PTR;
27 27
28 int dram_init(void) 28 int dram_init(void)
29 { 29 {
30 /* dram_init must store complete ramsize in gd->ram_size */ 30 /* dram_init must store complete ramsize in gd->ram_size */
31 gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE, 31 gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
32 PHYS_SDRAM_1_SIZE); 32 PHYS_SDRAM_1_SIZE);
33 return 0; 33 return 0;
34 } 34 }
35 35
36 int board_early_init_f(void) 36 int board_early_init_f(void)
37 { 37 {
38 mx25_uart1_init_pins(); 38 mx25_uart1_init_pins();
39 39
40 return 0; 40 return 0;
41 } 41 }
42 42
43 int board_init(void) 43 int board_init(void)
44 { 44 {
45 gd->bd->bi_arch_number = MACH_TYPE_MX25_3DS;
46 /* address of boot parameters */ 45 /* address of boot parameters */
47 gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; 46 gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
48 47
49 return 0; 48 return 0;
50 } 49 }
51 50
52 int checkboard(void) 51 int checkboard(void)
53 { 52 {
54 puts("Board: MX25PDK\n"); 53 puts("Board: MX25PDK\n");
55 54
56 return 0; 55 return 0;
57 } 56 }
58 57
include/configs/mx25pdk.h
Diff comments   View file @ f39c008
1 /* 1 /*
2 * (C) Copyright 2011 Freescale Semiconductor, Inc. 2 * (C) Copyright 2011 Freescale Semiconductor, Inc.
3 * 3 *
4 * This program is free software; you can redistribute it and/or 4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License as 5 * modify it under the terms of the GNU General Public License as
6 * published by the Free Software Foundation; either version 2 of 6 * published by the Free Software Foundation; either version 2 of
7 * the License, or (at your option) any later version. 7 * the License, or (at your option) any later version.
8 * 8 *
9 * This program is distributed in the hope that it will be useful, 9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 */ 13 */
14 14
15 #ifndef __CONFIG_H 15 #ifndef __CONFIG_H
16 #define __CONFIG_H 16 #define __CONFIG_H
17 17
18 /* High Level Configuration Options */ 18 /* High Level Configuration Options */
19 19
20 #define CONFIG_MX25_CLK32 32768 /* OSC32K frequency */ 20 #define CONFIG_MX25_CLK32 32768 /* OSC32K frequency */
21 #define CONFIG_SYS_HZ 1000 21 #define CONFIG_SYS_HZ 1000
22 #define CONFIG_SYS_TEXT_BASE 0x81200000 22 #define CONFIG_SYS_TEXT_BASE 0x81200000
23 23
24 #define CONFIG_DISPLAY_CPUINFO 24 #define CONFIG_DISPLAY_CPUINFO
25 #define CONFIG_DISPLAY_BOARDINFO 25 #define CONFIG_DISPLAY_BOARDINFO
26 26
27 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ 27 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
28 #define CONFIG_SETUP_MEMORY_TAGS 28 #define CONFIG_SETUP_MEMORY_TAGS
29 #define CONFIG_INITRD_TAG 29 #define CONFIG_INITRD_TAG
30 30
31 #define CONFIG_MACH_TYPE MACH_TYPE_MX25_3DS
32
31 /* Size of malloc() pool */ 33 /* Size of malloc() pool */
32 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) 34 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
33 35
34 /* Physical Memory Map */ 36 /* Physical Memory Map */
35 37
36 #define CONFIG_NR_DRAM_BANKS 1 38 #define CONFIG_NR_DRAM_BANKS 1
37 #define PHYS_SDRAM_1 0x80000000 39 #define PHYS_SDRAM_1 0x80000000
38 #define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024) 40 #define PHYS_SDRAM_1_SIZE (64 * 1024 * 1024)
39 41
40 #define CONFIG_BOARD_EARLY_INIT_F 42 #define CONFIG_BOARD_EARLY_INIT_F
41 43
42 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 44 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
43 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \ 45 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
44 GENERATED_GBL_DATA_SIZE) 46 GENERATED_GBL_DATA_SIZE)
45 47
46 /* Memory Test */ 48 /* Memory Test */
47 #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE/2) 49 #define CONFIG_SYS_MEMTEST_START (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE/2)
48 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE) 50 #define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
49 51
50 /* Stack sizes */ 52 /* Stack sizes */
51 #define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ 53 #define CONFIG_STACKSIZE (128 * 1024) /* regular stack */
52 54
53 /* Serial Info */ 55 /* Serial Info */
54 #define CONFIG_MXC_UART 56 #define CONFIG_MXC_UART
55 #define CONFIG_SYS_MX25_UART1 57 #define CONFIG_SYS_MX25_UART1
56 #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ 58 #define CONFIG_CONS_INDEX 1 /* use UART0 for console */
57 #define CONFIG_BAUDRATE 115200 /* Default baud rate */ 59 #define CONFIG_BAUDRATE 115200 /* Default baud rate */
58 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } 60 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
59 61
60 /* No NOR flash present */ 62 /* No NOR flash present */
61 #define CONFIG_ENV_OFFSET (6 * 64 * 1024) 63 #define CONFIG_ENV_OFFSET (6 * 64 * 1024)
62 #define CONFIG_ENV_SIZE (8 * 1024) 64 #define CONFIG_ENV_SIZE (8 * 1024)
63 #define CONFIG_ENV_IS_NOWHERE 65 #define CONFIG_ENV_IS_NOWHERE
64 66
65 #define CONFIG_SYS_NO_FLASH 67 #define CONFIG_SYS_NO_FLASH
66 #define CONFIG_SYS_64BIT_VSPRINTF 68 #define CONFIG_SYS_64BIT_VSPRINTF
67 69
68 /* U-Boot general configuration */ 70 /* U-Boot general configuration */
69 #define CONFIG_SYS_PROMPT "MX25PDK U-Boot > " 71 #define CONFIG_SYS_PROMPT "MX25PDK U-Boot > "
70 #define CONFIG_AUTO_COMPLETE 72 #define CONFIG_AUTO_COMPLETE
71 #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ 73 #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
72 /* Print buffer sz */ 74 /* Print buffer sz */
73 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ 75 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
74 sizeof(CONFIG_SYS_PROMPT) + 16) 76 sizeof(CONFIG_SYS_PROMPT) + 16)
75 #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ 77 #define CONFIG_SYS_MAXARGS 16 /* max number of command args */
76 /* Boot Argument Buffer Size */ 78 /* Boot Argument Buffer Size */
77 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE 79 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
78 #define CONFIG_CMDLINE_EDITING 80 #define CONFIG_CMDLINE_EDITING
79 #define CONFIG_SYS_LONGHELP 81 #define CONFIG_SYS_LONGHELP
80 82
81 /* U-Boot commands */ 83 /* U-Boot commands */
82 #include <config_cmd_default.h> 84 #include <config_cmd_default.h>
83 #define CONFIG_CMD_CACHE 85 #define CONFIG_CMD_CACHE
84 86
85 /* Ethernet */ 87 /* Ethernet */
86 #define CONFIG_FEC_MXC 88 #define CONFIG_FEC_MXC
87 #define CONFIG_FEC_MXC_PHYADDR 0x1f 89 #define CONFIG_FEC_MXC_PHYADDR 0x1f
88 #define CONFIG_MII 90 #define CONFIG_MII
89 #define CONFIG_CMD_NET 91 #define CONFIG_CMD_NET
90 #define CONFIG_NET_MULTI 92 #define CONFIG_NET_MULTI
91 #define CONFIG_ENV_OVERWRITE 93 #define CONFIG_ENV_OVERWRITE
92 94
93 #define CONFIG_BOOTDELAY 3 95 #define CONFIG_BOOTDELAY 3
94 96
95 #define CONFIG_LOADADDR 0x81000000 /* loadaddr env var */ 97 #define CONFIG_LOADADDR 0x81000000 /* loadaddr env var */
96 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR 98 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
97 99
98 #define CONFIG_EXTRA_ENV_SETTINGS \ 100 #define CONFIG_EXTRA_ENV_SETTINGS \
99 "script=boot.scr\0" \ 101 "script=boot.scr\0" \
100 "uimage=uImage\0" \ 102 "uimage=uImage\0" \
101 "netargs=setenv bootargs console=ttymxc0,${baudrate} " \ 103 "netargs=setenv bootargs console=ttymxc0,${baudrate} " \
102 "root=/dev/nfs " \ 104 "root=/dev/nfs " \
103 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ 105 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
104 "bootcmd=run netargs; dhcp ${uimage}; bootm\0" \ 106 "bootcmd=run netargs; dhcp ${uimage}; bootm\0" \
105 107
106 #endif /* __CONFIG_H */ 108 #endif /* __CONFIG_H */
107 109