Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340169
b: refs/heads/master
c: 631a7b5
h: refs/heads/master
i:
  340167: 7c4f882
v: v3
  • Loading branch information
Nobuhiro Iwamatsu authored and Simon Horman committed Oct 30, 2012
1 parent 3d8b585 commit 38cddf8
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 451 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6a800a0bb0483097b7a5391b4e010acad8a85d4e
refs/heads/master: 631a7b5d958d2ef2c2333b105794c693642f0641
57 changes: 0 additions & 57 deletions trunk/arch/arm/configs/g4evm_defconfig

This file was deleted.

9 changes: 1 addition & 8 deletions trunk/arch/arm/mach-shmobile/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ config ARCH_EMEV2

comment "SH-Mobile Board Type"

config MACH_G4EVM
bool "G4EVM board"
depends on ARCH_SH7377
select ARCH_REQUIRE_GPIOLIB
select REGULATOR_FIXED_VOLTAGE if REGULATOR

config MACH_AP4EVB
bool "AP4EVB board"
depends on ARCH_SH7372
Expand Down Expand Up @@ -142,7 +136,7 @@ menu "Memory configuration"

config MEMORY_START
hex "Physical memory start address"
default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \
MACH_MACKEREL || MACH_BONITO || \
MACH_ARMADILLO800EVA
default "0x41000000" if MACH_KOTA2
Expand All @@ -154,7 +148,6 @@ config MEMORY_START

config MEMORY_SIZE
hex "Physical memory size"
default "0x08000000" if MACH_G4EVM
default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
MACH_ARMADILLO800EVA
default "0x1e000000" if MACH_KOTA2
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/arm/mach-shmobile/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o
obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o

# Board objects
obj-$(CONFIG_MACH_G4EVM) += board-g4evm.o
obj-$(CONFIG_MACH_AP4EVB) += board-ap4evb.o
obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o
obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
Expand Down
Loading

0 comments on commit 38cddf8

Please sign in to comment.