OMAP3: Minor code clean up, no functional change
cover OMAP3: Minor code clean up, no functional change
This patch series is an attempt (*) to help with [1] and the first part of [2].
It contains only minor code clean up, no functional changes.
Complete patch series boot tested on OMAP3 BeagleBoard and compile tested with ./MAKEALL ARM_CORTEX_A8.
I'm unsure about two topics:
* The initial ideas and patches for these changes are all from Jean-Christophe (*). So I added Jean-Christophe's From: and Signed-off-by:. If this is wrong, please correct.
* Patch 2/3 renames interrupts.c to timer.c. In git this can be done easier by just rename. But for testing and sending it as patch to be applied I had to do it this way. Maybe the rename could be done easier while applying the patch to git?
Best regards
Dirk
(*) Jean-Christophe told me that he is busy, hopefully I can help a little
with this.
[1] http://lists.denx.de/pipermail/u-boot/2009-May/051948.html
[2] http://lists.denx.de/pipermail/u-boot/2009-May/051949.html
PATCH 1/3 OMAP3: Remove dublicated interrupt code
Remove duplicated interrupt code. Original, identical code can be found in lib_arm/interrupts.c
From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- cpu/arm_cortexa8/omap3/interrupts.c | 128 ------------------------------------ 1 file changed, 128 deletions(-)
cpu/arm_cortexa8/omap3/interrupts.c +0 -128
@@ -34,134 +34,6 @@#include <common.h> #include <asm/io.h> -#include <asm/proc-armv/ptrace.h> - -#ifdef CONFIG_USE_IRQ -/* enable IRQ interrupts */ -void enable_interrupts (void ) -{ -unsigned long temp; - __asm__ __volatile__("mrs %0, cpsr\n" -"bic %0, %0, #0x80\n" "msr cpsr_c, %0" :"=r" (temp) - ::"memory" ); -} - -/* -* disable IRQ/FIQ interrupts -* returns true if interrupts had been enabled before we disabled them -*/ -int disable_interrupts (void ) -{ -unsigned long old, temp; - __asm__ __volatile__("mrs %0, cpsr\n" -"orr %1, %0, #0xc0\n" -"msr cpsr_c, %1" :"=r" (old),"=r" (temp) - ::"memory" ); -return (old &0x80 ) ==0 ; -} -#else -void enable_interrupts (void ) -{ -return ; -} -int disable_interrupts (void ) -{ -return 0 ; -} -#endif - -void bad_mode (void ) -{ -panic ("Resetting CPU ...\n" ); -reset_cpu (0 ); -} - -void show_regs (struct pt_regs *regs) -{ -unsigned long flags; -const char *processor_modes[] = { -"USER_26" ,"FIQ_26" ,"IRQ_26" ,"SVC_26" , -"UK4_26" ,"UK5_26" ,"UK6_26" ,"UK7_26" , -"UK8_26" ,"UK9_26" ,"UK10_26" ,"UK11_26" , -"UK12_26" ,"UK13_26" ,"UK14_26" ,"UK15_26" , -"USER_32" ,"FIQ_32" ,"IRQ_32" ,"SVC_32" , -"UK4_32" ,"UK5_32" ,"UK6_32" ,"ABT_32" , -"UK8_32" ,"UK9_32" ,"UK10_32" ,"UND_32" , -"UK12_32" ,"UK13_32" ,"UK14_32" ,"SYS_32" , - }; - - flags =condition_codes (regs); - -printf ("pc : [<%08lx>] lr : [<%08lx>]\n" -"sp : %08lx ip : %08lx fp : %08lx\n" , -instruction_pointer (regs), - regs->ARM_lr, regs->ARM_sp, regs->ARM_ip, regs->ARM_fp); -printf ("r10: %08lx r9 : %08lx r8 : %08lx\n" , - regs->ARM_r10, regs->ARM_r9, regs->ARM_r8); -printf ("r7 : %08lx r6 : %08lx r5 : %08lx r4 : %08lx\n" , - regs->ARM_r7, regs->ARM_r6, regs->ARM_r5, regs->ARM_r4); -printf ("r3 : %08lx r2 : %08lx r1 : %08lx r0 : %08lx\n" , - regs->ARM_r3, regs->ARM_r2, regs->ARM_r1, regs->ARM_r0); -printf ("Flags: %c%c%c%c" , - flags &CC_N_BIT ?'N' :'n' , - flags &CC_Z_BIT ?'Z' :'z' , - flags &CC_C_BIT ?'C' :'c' , flags &CC_V_BIT ?'V' :'v' ); -printf (" IRQs %s FIQs %s Mode %s%s\n" , -interrupts_enabled (regs) ?"on" :"off" , -fast_interrupts_enabled (regs) ?"on" :"off" , - processor_modes[processor_mode (regs)], -thumb_mode (regs) ?" (T)" :"" ); -} - -void do_undefined_instruction (struct pt_regs *pt_regs) -{ -printf ("undefined instruction\n" ); -show_regs (pt_regs); -bad_mode (); -} - -void do_software_interrupt (struct pt_regs *pt_regs) -{ -printf ("software interrupt\n" ); -show_regs (pt_regs); -bad_mode (); -} - -void do_prefetch_abort (struct pt_regs *pt_regs) -{ -printf ("prefetch abort\n" ); -show_regs (pt_regs); -bad_mode (); -} - -void do_data_abort (struct pt_regs *pt_regs) -{ -printf ("data abort\n" ); -show_regs (pt_regs); -bad_mode (); -} - -void do_not_used (struct pt_regs *pt_regs) -{ -printf ("not used\n" ); -show_regs (pt_regs); -bad_mode (); -} - -void do_fiq (struct pt_regs *pt_regs) -{ -printf ("fast interrupt request\n" ); -show_regs (pt_regs); -bad_mode (); -} - -void do_irq (struct pt_regs *pt_regs) -{ -printf ("interrupt request\n" ); -show_regs (pt_regs); -bad_mode (); -} -static ulong timestamp;static ulong lastinc;
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
After removal of dublicated interrupt code, rename file to what it really does now.
From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- cpu/arm_cortexa8/omap3/Makefile | 2 cpu/arm_cortexa8/omap3/interrupts.c | 138 ------------------------------------ cpu/arm_cortexa8/omap3/timer.c | 138 ++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 139 deletions(-)
cpu/arm_cortexa8/omap3/Makefile +1 -1
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a SOBJS := lowlevel_init.o -COBJS := sys_info.o board.o clock.o interrupts.o mem.o syslib.o +COBJS := sys_info.o board.o clock.o timer.o mem.o syslib.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
cpu/arm_cortexa8/omap3/timer.c new file +138 -0
138 lines not on this page · raw message
cpu/arm_cortexa8/omap3/interrupts.c deleted +0 -138
138 lines not on this page · raw message
PATCH 3/3 OMAP3: Reorganize Makefile style
Reformat COBJS handling.
From: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
--- cpu/arm_cortexa8/omap3/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
cpu/arm_cortexa8/omap3/Makefile +7 -1
@@ -26,7 +26,13 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).a SOBJS := lowlevel_init.o -COBJS := sys_info.o board.o clock.o timer.o mem.o syslib.o + +COBJS += board.o +COBJS += clock.o +COBJS += mem.o +COBJS += syslib.o +COBJS += sys_info.o +COBJS += timer.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
PATCH 3/3 OMAP3: Reorganize Makefile style
Quoted 1 line · Dirk Behme
Reformat COBJS handling.
please rebase against you first patch as the 2 will be handle by an otherone
Best Regards,
J.
PATCH 3/3 OMAP3: Reorganize Makefile style
Dear Jean-Christophe,
Quoted 3 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line · Dirk Behme
Reformat COBJS handling.
please rebase against you first patch as the 2 will be handle by an otherone
Sorry, but I don't understand what you want here. All three patches are fine in this order and apply cleanly on each other. What rebase will be neccesary?
Best regards
Dirk
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
In reply to Dirk BehmeQuoted 2 lines · Dirk Behme
After removal of dublicated interrupt code, rename file to what it really does now.
I prefer to rename all files at the same time
Btw please use git to show that you only rename the file without change
Best Regards,
J.
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
Dear Jean-Christophe,
Quoted 4 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 2 lines · Dirk Behme
After removal of dublicated interrupt code, rename file to what it really does now.
I prefer to rename all files at the same time
Then, please don't complain that you have "to do everything on your own and nobody helps you" ;) I would prefer that changes are done by the board maintainers and not by the custodian, though.
Quoted 1 line
Btw please use git to show that you only rename the file without change
I'm not sure that this works for non-custodians. Custodians can do git-rename and then send a patch to the mailing list. When a custodian sends such a patch, it is mainly for review only, and not to be applied somewhere (because it is already in git).
This results then in something
cpu/sa1100/{interrupts.c => timer.c} | 5 +-
rename cpu/arm925t/{interrupts.c => timer.c} (99%)
(from [1]). But this is only what normally 'diffstat' generates and what is totally ignored by 'patch' . I.e. in the part of the patch which is handled by 'patch' this info is totally missing. As far as I know 'patch' itself can't deal with file rename any other way than remove one file and create the other one with
--- u-boot-main.orig/cpu/arm_cortexa8/omap3/interrupts.c +++ /dev/null
--- /dev/null
+++ u-boot-main/cpu/arm_cortexa8/omap3/timer.c
So it's my understanding that non-custodians have to send a patch which can be applied everywhere by everyone by 'patch' utility, i.e. the part 'patch' deals with contains all information necessary.
Do I miss anything?
Best regards
Dirk
[1] http://lists.denx.de/pipermail/u-boot/2009-May/051921.html
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
Quoted 5 lines · Dirk Behme
I'm not sure that this works for non-custodians. Custodians can do git-rename and then send a patch to the mailing list. When a custodian sends such a patch, it is mainly for review only, and not to be applied somewhere (because it is already in git).
Quoted 7 lines
This results then in something
cpu/sa1100/{interrupts.c=>timer.c} | 5 +-
renamecpu/arm925t/{interrupts.c=>timer.c} (99%)(from [1]). But this is only what normally 'diffstat' generates and what is totally ignored by 'patch' .
It can be applied with "git am" (well, not the diffstat, but the special rename diff hunk that git also generates).
-Scott
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
Quoted 8 lines · Scott Wood
Quoted 7 lines · Dirk Behme
I'm not sure that this works for non-custodians. Custodians can do git-rename and then send a patch to the mailing list. When a custodian sends such a patch, it is mainly for review only, and not to be applied somewhere (because it is already in git).
This results then in something
Quoted 8 lines
Quoted 5 lines
cpu/sa1100/{interrupts.c=>timer.c} | 5 +-
renamecpu/arm925t/{interrupts.c=>timer.c} (99%)(from [1]). But this is only what normally 'diffstat' generates and what is totally ignored by 'patch' .
It can be applied with "git am" (well, not the diffstat, but the special rename diff hunk that git also generates).
Ok, thanks. But not with other tools, like plain 'patch', correct?
Best regards
Dirk
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
Quoted 5 lines · Dirk Behme
Quoted 2 lines · Scott Wood
It can be applied with "git am" (well, not the diffstat, but the special rename diff hunk that git also generates).
Ok, thanks. But not with other tools, like plain 'patch', correct?
Right, until someone fixes that. :-)
Which I suppose could be a problem if "git am" refuses to accept the patch and the normal patch command needs to be used to resolve the conflict (I really wish git would treat it more like a merge from a UI perspective, even if it doesn't look that way internally).
-Scott
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
In reply to Dirk BehmeDear Dirk,
Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 6 lines
Quoted 6 lines
This results then in something
cpu/sa1100/{interrupts.c=>timer.c} | 5 +-
renamecpu/arm925t/{interrupts.c=>timer.c} (99%)
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
(from [1]). But this is only what normally 'diffstat' generates and what is totally ignored by 'patch' .
It can be applied with "git am" (well, not the diffstat, but the special rename diff hunk that git also generates).
Ok, thanks. But not with other tools, like plain 'patch', correct?
Indeed. But why would you use such a tool in combination with a git repository? It makes no sense.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de You can't evaluate a man by logic alone. -- McCoy, "I, Mudd", stardate 4513.3
PATCH 2/3 OMAP3: Rename interrupts.c to timer.c
In reply to Dirk BehmeDear Dirk,
Quoted 7 lines · In message <[email protected]> you wrote:
Quoted 2 lines
Btw please use git to show that you only rename the file without change
I'm not sure that this works for non-custodians. Custodians can do git-rename and then send a patch to the mailing list. When a custodian sends such a patch, it is mainly for review only, and not to be applied somewhere (because it is already in git).
In which way is this rtestricted to custodians? everybody can do the same in his own git repositories and use this to provide patches and statistics.
Quoted 2 lines
(from [1]). But this is only what normally 'diffstat' generates and what is totally ignored by 'patch' . I.e. in the part of the patch
We don't use plain old "patch", we use git tools (like "git am"). And these do understand about rename patches.
Quoted 3 lines
which is handled by 'patch' this info is totally missing. As far as I know 'patch' itself can't deal with file rename any other way than remove one file and create the other one with
That's why we use git.
Quoted 5 lines
So it's my understanding that non-custodians have to send a patch which can be applied everywhere by everyone by 'patch' utility, i.e. the part 'patch' deals with contains all information necessary.
Do I miss anything?
Yes, you are missing that we use git these days, and git is more powerful.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In the beginning, there was nothing, which exploded.
- Terry Pratchett, _Lords and Ladies_