Skip to contentSkip to conversation

MARVELL: Delete now-superfluous board/Marvell/{common, include} dirs.

PATCH In review Robert P. J. Day 3 participants 5 messages May 15, 2016 – May 30, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 MARVELL: Delete now-superfluous board/Marvell/{common, include} dirs.

With dropping support for some boards and the deletion of some source files, it appears that both of these directories are now superfluous.

---

i'm quite prepared to be told i've totally misread stuff; if so,
just say so and toss this patch.

board/Marvell/common/bootseq.txt deleted +0 -94
deleted file mode 100644
index 6cae9ea..0000000
@@ -1,94 +0,0 @@
-(cpu/mpc7xxx/start.S)
-
-start:
-    b boot_cold
-
-start_warm:
-    b boot_warm
-
-
-boot_cold:
-boot_warm:
-    clear bats
-    init l2 (if enabled)
-    init altivec (if enabled)
-    invalidate l2 (if enabled)
-    setup bats (from defines in config_EVB)
-    enable_addr_trans: (if MMU enabled)
-	enable MSR_IR and MSR_DR
-    jump to in_flash
-
-in_flash:
-    enable l1 dcache
-    gal_low_init: (board/evb64260/sdram_init.S)
-	config SDRAM (CFG, TIMING, DECODE)
-	init scratch regs (810 + 814)
-
-	detect DIMM0 (bank 0 only)
-	config SDRAM_PARA0 to 256/512Mbit
-	bl sdram_op_mode
-	detect bank0 width
-	    write scratch reg 810
-	config SDRAM_PARA0 with results
-	config SDRAM_PARA1 with results
-
-	detect DIMM1 (bank 2 only)
-	config SDRAM_PARA2 to 256/512Mbit
-	detect bank2 width
-	    write scratch reg 814
-	config SDRAM_PARA2 with results
-	config SDRAM_PARA3 with results
-
-	setup device bus timings/width
-	setup boot device timings/width
-
-	setup CPU_CONF (0x0)
-	setup cpu master control register 0x160
-	setup PCI0 TIMEOUT
-	setup PCI1 TIMEOUT
-	setup PCI0 BAR
-	setup PCI1 BAR
-
-	setup MPP control 0-3
-	setup GPP level control
-	setup Serial ports multiplex
-
-    setup stack pointer (r1)
-    setup GOT
-    call cpu_init_f
-	debug leds
-    board_init_f: (common/board.c)
-	board_early_init_f:
-	    remap gt regs?
-	    map PCI mem/io
-	    map device space
-	    clear out interrupts
-	init_timebase
-	env_init
-	serial_init
-	console_init_f
-	display_options
-	initdram: (board/evb64260/evb64260.c)
-	    detect memory
-	    for each bank:
-		dram_size()
-		setup PCI slave memory mappings
-		setup SCS
-	setup monitor
-	alloc board info struct
-	init bd struct
-	relocate_code: (cpu/mpc7xxx/start.S)
-	    copy,got,clearbss
-	    board_init_r(bd, dest_addr) (common/board.c)
-		setup bd function pointers
-		trap_init
-		flash_init: (board/evb64260/flash.c)
-		setup bd flash info
-		cpu_init_r: (cpu/mpc7xxx/cpu_init.c)
-		    nothing
-		mem_malloc_init
-		malloc_bin_reloc
-		spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
-		env_relocated
-		misc_init_r(bd): (board/evb64260/evb64260.c)
-		    mpsc_init2
board/Marvell/common/i2c.h deleted +0 -16
deleted file mode 100644
index a879ea9..0000000
@@ -1,16 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * SPDX-License-Identifier:	GPL-2.0+
- *
- * Hacked for the DB64360 board by Ingo.Assmus at keymile.com
- */
-
-#ifndef __I2C_H__
-#define __I2C_H__
-
-/* function declarations */
-uchar i2c_read(uchar, unsigned int, int, uchar*, int);
-
-#endif
board/Marvell/common/intel_flash.h deleted +0 -170

170 lines not on this page · raw message

board/Marvell/common/memory.c deleted +0 -1374

1,374 lines not on this page · raw message

board/Marvell/common/ns16550.c deleted +0 -66

66 lines not on this page · raw message

board/Marvell/common/ns16550.h deleted +0 -102

102 lines not on this page · raw message

board/Marvell/common/serial.c deleted +0 -162

162 lines not on this page · raw message

board/Marvell/include/memory.h deleted +0 -173

173 lines not on this page · raw message

board/Marvell/include/pci.h deleted +0 -293

293 lines not on this page · raw message

rday

Signature · 7 lines
========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================
#1 lore raw

PATCH 1/1 MARVELL: Delete now-superfluous board/Marvell/{common, include} dirs.

Quoted 7 lines · Robert P. J. Day

With dropping support for some boards and the deletion of some source files, it appears that both of these directories are now superfluous.

---

You can always run buildman for all arm boards and see what broke. I use this script:

{(

        branch=`git branch | grep '^*' | sed "s/^..//"`
        dir=/tmp/bm-$1
        arch="arm aarch64 mips powerpc nios2"
        shift 1
        ./tools/buildman/buildman -o ${dir} -b ${branch} \
                                  --step=0 ${arch} $@

)}

Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 MARVELL: Delete now-superfluous board/Marvell/{common, include} dirs.

Quoted 12 lines · Marek Vasut
Quoted 7 lines · Robert P. J. Day

With dropping support for some boards and the deletion of some source files, it appears that both of these directories are now superfluous.

---

You can always run buildman for all arm boards and see what broke. I use this script:

Quoted 8 lines

{(

        branch=`git branch | grep '^*' | sed "s/^..//"`
        dir=/tmp/bm-$1
        arch="arm aarch64 mips powerpc nios2"
        shift 1
        ./tools/buildman/buildman -o ${dir} -b ${branch} \
                                  --step=0 ${arch} $@

)}

ah, should i do that, then resubmit that patch, or has someone
already looked at it for sanity?

rday

Signature · 7 lines
========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================
#3 lore raw
In reply to Robert P. J. Day
Quoted 4 lines · Robert P. J. Day

With dropping support for some boards and the deletion of some source files, it appears that both of these directories are now superfluous.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/628c2e08/attachment.sig>
#4 lore raw
In reply to Robert P. J. Day
Quoted 4 lines · Robert P. J. Day

With dropping support for some boards and the deletion of some source files, it appears that both of these directories are now superfluous.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160530/b7ca9270/attachment.sig>