Merge pull request linux-sunxi#22 from allwinner-dev-team/allwinner-3.0

Fix build using O= (issue linux-sunxi#21) and inline build on CM9
wrobelda · May 19, 2012 · f8959c5 · f8959c5
2 parents 1406ff9 + 950523a
commit f8959c5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Android.mk b/Android.mk
diff --git a/arch/arm/mach-sun4i/clock/Makefile b/arch/arm/mach-sun4i/clock/Makefile
@@ -1,10 +1,4 @@
-
-
-obj-y += ccmu/ccm_mod_clk.o \
-         ccmu/ccm_sys_clk.o \
-         ccmu/ccm.o \
-         ccmu/pll_cfg_tbl.o \
-         ccmu/ccu_dbg.o \
-         clock.o \
+obj-y += ccmu/
+obj-y += clock.o \
          aw_clocksrc.o
 
diff --git a/arch/arm/mach-sun4i/clock/ccmu/Makefile b/arch/arm/mach-sun4i/clock/ccmu/Makefile
@@ -0,0 +1,5 @@
+obj-y += ccm_mod_clk.o \
+         ccm_sys_clk.o \
+         ccm.o \
+         pll_cfg_tbl.o \
+         ccu_dbg.o \
diff --git a/arch/arm/mach-sun4i/pm/standby/Makefile b/arch/arm/mach-sun4i/pm/standby/Makefile
@@ -1,6 +1,8 @@
 always	:= standby.bin
 targets := standby.elf
 
+obj-y += dram/
+
 standby-y := common.o standby.o stack.o standby_clock.o \
 	     dram/dram.o dram/dram_init.o \
 	     standby_int.o standby_ir.o standby_key.o standby_power.o \

diff --git a/arch/arm/mach-sun4i/pm/standby/dram/Makefile b/arch/arm/mach-sun4i/pm/standby/dram/Makefile
@@ -0,0 +1 @@
+obj-y += dram.o dram_init.o