Commit 11648cbb authored by Randy Dunlap's avatar Randy Dunlap Committed by Stafford Horne
Browse files

openrisc: rename or32 code & comments to or1k 



From Documentation/openrisc/todo.rst, rename "or32" in the
source code to "or1k" since this is the name that has been
settled on.

Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: openrisc@lists.librecores.org
Signed-off-by: default avatarStafford Horne <shorne@gmail.com>
parent 946e1052

arch/openrisc/include/asm/pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * et al.

 */



/* or32 pgtable.h - macros and functions to manipulate page tables

/* or1k pgtable.h - macros and functions to manipulate page tables

 *

 * Based on:

 * include/asm-cris/pgtable.h
@@ -29,14 +29,14 @@ 


/*

 * The Linux memory management assumes a three-level page table setup. On

 * or32, we use that, but "fold" the mid level into the top-level page

 * or1k, we use that, but "fold" the mid level into the top-level page

 * table. Since the MMU TLB is software loaded through an interrupt, it

 * supports any page table structure, so we could have used a three-level

 * setup, but for the amounts of memory we normally use, a two-level is

 * probably more efficient.

 *

 * This file contains the functions and defines necessary to modify and use

 * the or32 page table tree.

 * the or1k page table tree.

 */



extern void paging_init(void);

arch/openrisc/include/asm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


/* THREAD_SIZE is the size of the task_struct/kernel_stack combo.

 * normally, the stack is found by doing something like p + THREAD_SIZE

 * in or32, a page is 8192 bytes, which seems like a sane size

 * in or1k, a page is 8192 bytes, which seems like a sane size

 */



#define THREAD_SIZE_ORDER 0

arch/openrisc/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ EXCEPTION_ENTRY(_data_page_fault_handler) 
1:	l.ori   r6,r0,0x0                  // !write access

2:



	/* call fault.c handler in or32/mm/fault.c */

	/* call fault.c handler in openrisc/mm/fault.c */

	l.jal   do_page_fault

	 l.nop

	l.j     _ret_from_exception
@@ -348,7 +348,7 @@ EXCEPTION_ENTRY(_insn_page_fault_handler) 
	/* r4 set be EXCEPTION_HANDLE */   // effective address of fault

	l.ori	r6,r0,0x0		   // !write access



	/* call fault.c handler in or32/mm/fault.c */

	/* call fault.c handler in openrisc/mm/fault.c */

	l.jal   do_page_fault

	 l.nop

	l.j     _ret_from_exception

arch/openrisc/kernel/head.S

+3 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ flush_tlb: 
	l.jal	_flush_tlb

	 l.nop



/* The MMU needs to be enabled before or32_early_setup is called */

/* The MMU needs to be enabled before or1k_early_setup is called */



enable_mmu:

	/*
@@ -641,9 +641,9 @@ enable_mmu: 
	/* magic number mismatch, set fdt pointer to null */

	l.or	r25,r0,r0

_fdt_found:

	/* pass fdt pointer to or32_early_setup in r3 */

	/* pass fdt pointer to or1k_early_setup in r3 */

	l.or	r3,r0,r25

	LOAD_SYMBOL_2_GPR(r24, or32_early_setup)

	LOAD_SYMBOL_2_GPR(r24, or1k_early_setup)

	l.jalr r24

	 l.nop

arch/openrisc/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ void __init setup_cpuinfo(void) 
}



/**

 * or32_early_setup

 * or1k_early_setup

 *

 * Handles the pointer to the device tree that this kernel is to use

 * for establishing the available platform devices.
@@ -217,7 +217,7 @@ void __init setup_cpuinfo(void) 
 * Falls back on built-in device tree in case null pointer is passed.

 */



void __init or32_early_setup(void *fdt)

void __init or1k_early_setup(void *fdt)

{

	if (fdt)

		pr_info("FDT at %p\n", fdt);