Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 59243
b: refs/heads/master
c: 4486b86
h: refs/heads/master
i:
  59241: b42685a
  59239: 7ad0b30
v: v3
  • Loading branch information
Russell King authored and Russell King committed Jul 12, 2007
1 parent 8ba9fc1 commit 9d73358
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 306 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: 8a87a996eae3d25b0670a243f4829ea4aa9eb63d
refs/heads/master: 4486b86368d72bcac76439638b36667b1c6a1360
1 change: 0 additions & 1 deletion trunk/arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,6 @@ config ARCH_L7200

config ARCH_KS8695
bool "Micrel/Kendin KS8695"
select GENERIC_GPIO
help
Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
System-on-Chip devices.
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/boot/compressed/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
piggy.gz
font.c
13 changes: 7 additions & 6 deletions trunk/arch/arm/boot/compressed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@

HEAD = head.o
OBJS = misc.o
FONTC = drivers/video/console/font_acorn_8x8.c

FONT = $(addprefix ../../../../drivers/video/console/, font_acorn_8x8.o)
FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c

#
# Architecture dependencies
#
ifeq ($(CONFIG_ARCH_ACORN),y)
OBJS += ll_char_wr.o $(FONT)
OBJS += ll_char_wr.o font.o
endif

ifeq ($(CONFIG_ARCH_SHARK),y)
Expand Down Expand Up @@ -73,7 +71,7 @@ endif

SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/

targets := vmlinux vmlinux.lds piggy.gz piggy.o $(FONT) \
targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
head.o misc.o $(OBJS)
EXTRA_CFLAGS := -fpic
EXTRA_AFLAGS :=
Expand Down Expand Up @@ -105,7 +103,10 @@ $(obj)/piggy.gz: $(obj)/../Image FORCE

$(obj)/piggy.o: $(obj)/piggy.gz FORCE

CFLAGS_font_acorn_8x8.o := -Dstatic=
CFLAGS_font.o := -Dstatic=

$(obj)/font.c: $(FONTC)
$(call cmd,shipped)

$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config
@sed "$(SEDFLAGS)" < $< > $@
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-ks8695/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Makefile for KS8695 architecture support
#

obj-y := cpu.o irq.o time.o gpio.o devices.o
obj-y := cpu.o irq.o time.o devices.o
obj-m :=
obj-n :=
obj- :=
Expand Down
218 changes: 0 additions & 218 deletions trunk/arch/arm/mach-ks8695/gpio.c

This file was deleted.

79 changes: 0 additions & 79 deletions trunk/include/asm-arm/arch-ks8695/gpio.h

This file was deleted.

0 comments on commit 9d73358

Please sign in to comment.