Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0234446fd171210a22d6fb99134ed51e9ea49855

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 223f88f46f
Exists in v2017.01-smarct4x and in 40 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-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_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, 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

nand_spl: remove MPC8536DS support 

Commit 3d5a335c announced that all the nand_spl boards
would be removed before v2014.07 release.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 4 changed files with 2 additions and 186 deletions Side-by-side Diff

... ... @@ -781,7 +781,6 @@
781 781 Active powerpc mpc85xx - freescale corenet_ds P5040DS_SPIFLASH P5040DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000 -
782 782 Active powerpc mpc85xx - freescale mpc8536ds MPC8536DS - -
783 783 Active powerpc mpc85xx - freescale mpc8536ds MPC8536DS_36BIT MPC8536DS:36BIT -
784   -Active powerpc mpc85xx - freescale mpc8536ds MPC8536DS_NAND MPC8536DS:NAND -
785 784 Active powerpc mpc85xx - freescale mpc8536ds MPC8536DS_SDCARD MPC8536DS:SDCARD -
786 785 Active powerpc mpc85xx - freescale mpc8536ds MPC8536DS_SPIFLASH MPC8536DS:SPIFLASH -
787 786 Active powerpc mpc85xx - freescale mpc8544ds MPC8544DS - -
include/configs/MPC8536DS.h
Diff comments   View file @ 0234446
... ... @@ -19,18 +19,6 @@
19 19 #define CONFIG_PHYS_64BIT 1
20 20 #endif
21 21  
22   -#ifdef CONFIG_NAND
23   -#define CONFIG_NAND_U_BOOT 1
24   -#define CONFIG_RAMBOOT_NAND 1
25   -#ifdef CONFIG_NAND_SPL
26   -#define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
27   -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
28   -#else
29   -#define CONFIG_SYS_LDSCRIPT $(CPUDIR)/u-boot-nand.lds
30   -#define CONFIG_SYS_TEXT_BASE 0xf8f82000
31   -#endif /* CONFIG_NAND_SPL */
32   -#endif
33   -
34 22 #ifdef CONFIG_SDCARD
35 23 #define CONFIG_RAMBOOT_SDCARD 1
36 24 #define CONFIG_SYS_TEXT_BASE 0xf8f40000
... ... @@ -222,8 +210,7 @@
222 210 #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */
223 211 #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */
224 212  
225   -#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_RAMBOOT_SDCARD) || \
226   - defined(CONFIG_RAMBOOT_SPIFLASH)
  213 +#if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
227 214 #define CONFIG_SYS_RAMBOOT
228 215 #define CONFIG_SYS_EXTRA_ENV_RELOC
229 216 #else
230 217  
... ... @@ -352,17 +339,10 @@
352 339 | OR_FCM_TRLX \
353 340 | OR_FCM_EHTR)
354 341  
355   -#ifdef CONFIG_RAMBOOT_NAND
356   -#define CONFIG_SYS_BR0_PRELIM CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
357   -#define CONFIG_SYS_OR0_PRELIM CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
358   -#define CONFIG_SYS_BR2_PRELIM CONFIG_FLASH_BR_PRELIM /* NOR Base Address */
359   -#define CONFIG_SYS_OR2_PRELIM CONFIG_FLASH_OR_PRELIM /* NOR Options */
360   -#else
361 342 #define CONFIG_SYS_BR0_PRELIM CONFIG_FLASH_BR_PRELIM /* NOR Base Address */
362 343 #define CONFIG_SYS_OR0_PRELIM CONFIG_FLASH_OR_PRELIM /* NOR Options */
363 344 #define CONFIG_SYS_BR2_PRELIM CONFIG_SYS_NAND_BR_PRELIM /* NAND Base Address */
364 345 #define CONFIG_SYS_OR2_PRELIM CONFIG_SYS_NAND_OR_PRELIM /* NAND Options */
365   -#endif
366 346  
367 347 #define CONFIG_SYS_BR4_PRELIM \
368 348 (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS + 0x40000) \
... ... @@ -625,12 +605,7 @@
625 605 */
626 606  
627 607 #if defined(CONFIG_SYS_RAMBOOT)
628   -#if defined(CONFIG_RAMBOOT_NAND)
629   -#define CONFIG_ENV_IS_IN_NAND 1
630   -#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE
631   -#define CONFIG_ENV_OFFSET ((768 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
632   -#define CONFIG_ENV_RANGE (3 * CONFIG_ENV_SIZE)
633   -#elif defined(CONFIG_RAMBOOT_SPIFLASH)
  608 +#if defined(CONFIG_RAMBOOT_SPIFLASH)
634 609 #define CONFIG_ENV_IS_IN_SPI_FLASH
635 610 #define CONFIG_ENV_SPI_BUS 0
636 611 #define CONFIG_ENV_SPI_CS 0
nand_spl/board/freescale/mpc8536ds/Makefile
View file @ 0234446
1   -#
2   -# (C) Copyright 2007
3   -# Stefan Roese, DENX Software Engineering, sr@denx.de.
4   -#
5   -# Copyright 2009-2011 Freescale Semiconductor, Inc.
6   -#
7   -# SPDX-License-Identifier: GPL-2.0+
8   -#
9   -
10   -CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
11   -PAD_TO := 0xfff01000
12   -
13   -nandobj := $(objtree)/nand_spl/
14   -
15   -LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
16   -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
17   - $(LDFLAGS) $(LDFLAGS_FINAL)
18   -asflags-y += -DCONFIG_NAND_SPL
19   -ccflags-y += -DCONFIG_NAND_SPL
20   -
21   -SOBJS = start.o resetvec.o
22   -COBJS = cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.o \
23   - nand_boot.o nand_boot_fsl_elbc.o ns16550.o tlb.o tlb_table.o
24   -
25   -OBJS := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
26   -__OBJS := $(SOBJS) $(COBJS)
27   -LNDIR := $(nandobj)board/$(BOARDDIR)
28   -
29   -targets += $(__OBJS)
30   -
31   -all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
32   -
33   -$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
34   - $(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@
35   -
36   -$(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl
37   - $(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@
38   -
39   -$(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds
40   - cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \
41   - -Map $(nandobj)u-boot-spl.map -o $@
42   -
43   -$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
44   - $(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
45   - -ansi -D__ASSEMBLY__ -P - <$< >$@
46   -
47   -# create symbolic links for common files
48   -
49   -$(obj)/cache.c:
50   - @rm -f $@
51   - ln -sf $(srctree)/arch/powerpc/lib/cache.c $@
52   -
53   -$(obj)/cpu_init_early.c:
54   - @rm -f $@
55   - ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@
56   -
57   -$(obj)/spl_minimal.c:
58   - @rm -f $@
59   - ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@
60   -
61   -$(obj)/fsl_law.c:
62   - @rm -f $@
63   - ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@
64   -
65   -$(obj)/law.c:
66   - @rm -f $@
67   - ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@
68   -
69   -$(obj)/nand_boot_fsl_elbc.c:
70   - @rm -f $@
71   - ln -sf $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@
72   -
73   -$(obj)/ns16550.c:
74   - @rm -f $@
75   - ln -sf $(srctree)/drivers/serial/ns16550.c $@
76   -
77   -$(obj)/resetvec.S:
78   - @rm -f $@
79   - ln -s $(srctree)/$(CPUDIR)/resetvec.S $@
80   -
81   -$(obj)/start.S:
82   - @rm -f $@
83   - ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@
84   -
85   -$(obj)/tlb.c:
86   - @rm -f $@
87   - ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@
88   -
89   -$(obj)/tlb_table.c:
90   - @rm -f $@
91   - ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@
nand_spl/board/freescale/mpc8536ds/nand_boot.c
View file @ 0234446
1   -/*
2   - * Copyright 2009 Freescale Semiconductor, Inc.
3   - *
4   - * SPDX-License-Identifier: GPL-2.0+
5   - */
6   -
7   -#include <common.h>
8   -#include <ns16550.h>
9   -#include <asm/io.h>
10   -#include <nand.h>
11   -
12   -u32 sysclk_tbl[] = {
13   - 33333000, 39999600, 49999500, 66666000,
14   - 83332500, 99999000, 133332000, 166665000
15   -};
16   -
17   -void board_init_f(ulong bootflag)
18   -{
19   - int px_spd;
20   - u32 plat_ratio, bus_clk, sys_clk;
21   - ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
22   -
23   -#if defined(CONFIG_SYS_BR3_PRELIM) && defined(CONFIG_SYS_OR3_PRELIM)
24   - /* for FPGA */
25   - set_lbc_br(3, CONFIG_SYS_BR3_PRELIM);
26   - set_lbc_or(3, CONFIG_SYS_OR3_PRELIM);
27   -#else
28   -#error CONFIG_SYS_BR3_PRELIM, CONFIG_SYS_OR3_PRELIM must be defined
29   -#endif
30   -
31   - /* initialize selected port with appropriate baud rate */
32   - px_spd = in_8((unsigned char *)(PIXIS_BASE + PIXIS_SPD));
33   - sys_clk = sysclk_tbl[px_spd & PIXIS_SPD_SYSCLK];
34   - plat_ratio = in_be32(&gur->porpllsr) & MPC85xx_PORPLLSR_PLAT_RATIO;
35   - bus_clk = sys_clk * plat_ratio / 2;
36   -
37   - NS16550_init((NS16550_t)CONFIG_SYS_NS16550_COM1,
38   - bus_clk / 16 / CONFIG_BAUDRATE);
39   -
40   - puts("\nNAND boot... ");
41   -
42   - /* copy code to RAM and jump to it - this should not return */
43   - /* NOTE - code has to be copied out of NAND buffer before
44   - * other blocks can be read.
45   - */
46   - relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, 0,
47   - CONFIG_SYS_NAND_U_BOOT_RELOC);
48   -}
49   -
50   -void board_init_r(gd_t *gd, ulong dest_addr)
51   -{
52   - nand_boot();
53   -}
54   -
55   -void putc(char c)
56   -{
57   - if (c == '\n')
58   - NS16550_putc((NS16550_t)CONFIG_SYS_NS16550_COM1, '\r');
59   -
60   - NS16550_putc((NS16550_t)CONFIG_SYS_NS16550_COM1, c);
61   -}
62   -
63   -void puts(const char *str)
64   -{
65   - while (*str)
66   - putc(*str++);
67   -}